From c068c4d060f5401310a9d67308c819a01aa2333e Mon Sep 17 00:00:00 2001
From: Robert Helmer <rhelmer@mozilla.com>
Date: Tue, 19 Jan 2016 11:01:19 -0800
Subject: [PATCH] Bug 1239484 - remove use of Object.values() r=mossop

---
 toolkit/mozapps/extensions/content/selectAddons.js              | 2 +-
 .../extensions/internal/AddonRepository_SQLiteMigrator.jsm      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolkit/mozapps/extensions/content/selectAddons.js b/toolkit/mozapps/extensions/content/selectAddons.js
index 2aac119fcc7..a15cbd747b2 100644
--- a/toolkit/mozapps/extensions/content/selectAddons.js
+++ b/toolkit/mozapps/extensions/content/selectAddons.js
@@ -126,7 +126,7 @@ var gChecking = {
     if (this._completeCount < this._addonCount)
       return;
 
-    let addons = Object.values(gAddons);
+    let addons = Object.keys(gAddons).map(k => gAddons[k]);
 
     addons.sort(function(a, b) {
       let orderA = orderForScope(a.addon.scope);
diff --git a/toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm b/toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm
index bffcd357ca1..b2204fe9526 100644
--- a/toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm
+++ b/toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm
@@ -60,7 +60,7 @@ this.AddonRepository_SQLiteMigrator = {
 
     this._retrieveStoredData((results) => {
       this._closeConnection();
-      let resultArray = Object.values(results);
+      let resultArray = Object.keys(results).map(k => results[k]);
       logger.debug(resultArray.length + " addons imported.")
       aCallback(resultArray);
     });