From cba601b1c9ecad3081d35c0fb93283b7118a1fc5 Mon Sep 17 00:00:00 2001
From: Narcis Beleuzu <nbeleuzu@mozilla.com>
Date: Fri, 3 Jul 2020 01:15:00 +0300
Subject: [PATCH] Backed out changeset 9acd9e718df0 (bug 1649899) for bc
 failures on browser_pioneer_ui.js . CLOSED TREE

---
 browser/components/pioneer/content/pioneer.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/browser/components/pioneer/content/pioneer.js b/browser/components/pioneer/content/pioneer.js
index acea1f6dc860..9490b65c8f23 100644
--- a/browser/components/pioneer/content/pioneer.js
+++ b/browser/components/pioneer/content/pioneer.js
@@ -55,12 +55,12 @@ async function showAvailableStudies(cachedAddons) {
   for (const cachedAddon of cachedAddons) {
     if (!cachedAddon) {
       console.error(
-        `about:pioneer - Study addon ID not found in cache: ${studyAddonId}`
+        `about:pioneer - Study addon ID not found in AMO cache: ${studyAddonId}`
       );
       return;
     }
 
-    const studyAddonId = cachedAddon.addon_id;
+    const studyAddonId = cachedAddon.id;
 
     const study = document.createElement("div");
     study.setAttribute("id", studyAddonId);
@@ -217,23 +217,23 @@ async function setup(cachedAddons) {
       if (pioneerId) {
         Services.prefs.clearUserPref(PREF_PIONEER_ID);
         for (const cachedAddon of cachedAddons) {
-          const addon = await AddonManager.getAddonByID(cachedAddon.addon_id);
+          const addon = await AddonManager.getAddonByID(cachedAddon.id);
           if (addon) {
             await addon.uninstall();
           }
 
-          const study = document.getElementById(cachedAddon.addon_id);
+          const study = document.getElementById(cachedAddon.id);
           if (study) {
-            await updateStudy(cachedAddon.addon_id);
+            await updateStudy(cachedAddon.id);
           }
         }
       } else {
         let uuid = generateUUID();
         Services.prefs.setStringPref(PREF_PIONEER_ID, uuid);
-        for (const cachedAddon of cachedAddons) {
-          const study = document.getElementById(cachedAddon.addon_id);
+        for (const addon of cachedAddons) {
+          const study = document.getElementById(addon.id);
           if (study) {
-            await updateStudy(cachedAddon.addon_id);
+            await updateStudy(addon.id);
           }
         }
       }
@@ -242,7 +242,7 @@ async function setup(cachedAddons) {
 
   const onAddonEvent = async addon => {
     for (const cachedAddon in cachedAddons) {
-      if (cachedAddon.addon_id == addon.id) {
+      if (cachedAddon.id == addon.id) {
         await updateStudy(addon.id);
       }
     }