author Mark Striemer <mstriemer@mozilla.com>

Thu, 07 Sep 2017 11:35:06 -0500

changeset 664359 8392c7e9cde4d847304624265a43410e1c75f1aa

parent 662425 b7f103d256b97191fe58277fbb14028a9f5f8819

child 731431 9896a2273c9ec36f0b71659e7728674468d9d7c4

push id 79682

push user bmo:mstriemer@mozilla.com

push date Wed, 13 Sep 2017 21:34:16 +0000

reviewers bsilverberg, jaws

bugs 1354344

milestone 57.0a1

browser/components/preferences/in-content/main.js file | annotate | diff | comparison | revisions

browser/components/preferences/in-content/main.xul file | annotate | diff | comparison | revisions

browser/components/preferences/in-content/tests/addons/set_homepage.xpi file | annotate | diff | comparison | revisions

browser/components/preferences/in-content/tests/browser.ini file | annotate | diff | comparison | revisions

browser/components/preferences/in-content/tests/browser_homepages_filter_aboutpreferences.js file | annotate | diff | comparison | revisions

browser/locales/en-US/chrome/browser/preferences/main.dtd file | annotate | diff | comparison | revisions

browser/locales/en-US/chrome/browser/preferences/preferences.properties file | annotate | diff | comparison | revisions

browser/themes/shared/incontentprefs/preferences.inc.css file | annotate | diff | comparison | revisions

toolkit/components/extensions/ExtensionPreferencesManager.jsm file | annotate | diff | comparison | revisions

toolkit/components/extensions/ExtensionSettingsStore.jsm file | annotate | diff | comparison | revisions

toolkit/components/extensions/test/xpcshell/test_ext_extensionSettingsStore.js file | annotate | diff | comparison | revisions
--- a/browser/components/preferences/in-content/main.js
+++ b/browser/components/preferences/in-content/main.js
@@ -1,16 +1,21 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* import-globals-from preferences.js */
 /* import-globals-from ../../../../toolkit/mozapps/preferences/fontbuilder.js */
 /* import-globals-from ../../../base/content/aboutDialog-appUpdater.js */
 
+XPCOMUtils.defineLazyModuleGetter(this, "ExtensionPreferencesManager",
+                                  "resource://gre/modules/ExtensionPreferencesManager.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "AddonManager",
+                                  "resource://gre/modules/AddonManager.jsm");
+
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/Downloads.jsm");
 Components.utils.import("resource://gre/modules/FileUtils.jsm");
 Components.utils.import("resource:///modules/ShellService.jsm");
 Components.utils.import("resource:///modules/TransientPrefs.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/AppConstants.jsm");
 Components.utils.import("resource://gre/modules/DownloadUtils.jsm");
@@ -231,16 +236,18 @@ var gMainPane = {
         gMainPane.setDefaultBrowser);
     }
     setEventListener("useCurrent", "command",
       gMainPane.setHomePageToCurrent);
     setEventListener("useBookmark", "command",
       gMainPane.setHomePageToBookmark);
     setEventListener("restoreDefaultHomePage", "command",
       gMainPane.restoreDefaultHomePage);
+    setEventListener("disableHomePageExtension", "command",
+                     gMainPane.makeDisableControllingExtension("homepage_override"));
     setEventListener("chooseLanguage", "command",
       gMainPane.showLanguages);
     setEventListener("translationAttributionImage", "click",
       gMainPane.openTranslationProviderAttribution);
     setEventListener("translateButton", "command",
       gMainPane.showTranslationExceptions);
     setEventListener("font.language.group", "change",
       gMainPane._rebuildFonts);
@@ -615,16 +622,29 @@ var gMainPane = {
    *   The deprecated option is not exposed in UI; however, if the user has it
    *   selected and doesn't change the UI for this preference, the deprecated
    *   option is preserved.
    */
 
   syncFromHomePref() {
     let homePref = document.getElementById("browser.startup.homepage");
 
+    // Set the "Use Current Page(s)" button's text and enabled state.
+    this._updateUseCurrentButton();
+
+    // This is an async task.
+    handleControllingExtension("homepage_override")
+      .then((isControlled) => {
+        // Disable or enable the inputs based on if this is controlled by an extension.
+        document.querySelectorAll("#browserHomePage, .homepage-button")
+          .forEach((button) => {
+            button.disabled = isControlled;
+          });
+      });
+
     // If the pref is set to about:home or about:newtab, set the value to ""
     // to show the placeholder text (about:home title) rather than
     // exposing those URLs to users.
     let defaultBranch = Services.prefs.getDefaultBranch("");
     let defaultValue = defaultBranch.getComplexValue("browser.startup.homepage",
       Ci.nsIPrefLocalizedString).data;
     let currentValue = homePref.value.toLowerCase();
     if (currentValue == "about:home" ||
@@ -690,27 +710,31 @@ var gMainPane = {
       homePage.value = rv.urls.join("|");
     }
   },
 
   /**
    * Switches the "Use Current Page" button between its singular and plural
    * forms.
    */
-  _updateUseCurrentButton() {
+  async _updateUseCurrentButton() {
     let useCurrent = document.getElementById("useCurrent");
-
-
     let tabs = this._getTabsForHomePage();
 
     if (tabs.length > 1)
       useCurrent.label = useCurrent.getAttribute("label2");
     else
       useCurrent.label = useCurrent.getAttribute("label1");
 
+    // If the homepage is controlled by an extension then you can't use this.
+    if (await getControllingExtensionId("homepage_override")) {
+      useCurrent.disabled = true;
+      return;
+    }
+
     // In this case, the button's disabled state is set by preferences.xml.
     let prefName = "pref.browser.homepage.disable_button.current_page";
     if (document.getElementById(prefName).locked)
       return;
 
     useCurrent.disabled = !tabs.length
   },
 
@@ -744,16 +768,24 @@ var gMainPane = {
   /**
    * Restores the default home page as the user's home page.
    */
   restoreDefaultHomePage() {
     var homePage = document.getElementById("browser.startup.homepage");
     homePage.value = homePage.defaultValue;
   },
 
+  makeDisableControllingExtension(pref) {
+    return async function disableExtension() {
+      let id = await getControllingExtensionId(pref);
+      let addon = await AddonManager.getAddonByID(id);
+      addon.userDisabled = true;
+    };
+  },
+
   /**
    * Utility function to enable/disable the button specified by aButtonID based
    * on the value of the Boolean preference specified by aPreferenceID.
    */
   updateButtons(aButtonID, aPreferenceID) {
     var button = document.getElementById(aButtonID);
     var preference = document.getElementById(aPreferenceID);
     button.disabled = preference.value != true;
@@ -2549,16 +2581,76 @@ function getLocalHandlerApp(aFile) {
   var localHandlerApp = Cc["@mozilla.org/uriloader/local-handler-app;1"].
     createInstance(Ci.nsILocalHandlerApp);
   localHandlerApp.name = getFileDisplayName(aFile);
   localHandlerApp.executable = aFile;
 
   return localHandlerApp;
 }
 
+let extensionControlledContentIds = {
+  "homepage_override": "browserHomePageExtensionContent",
+};
+
+/**
+  * Check if a pref is being managed by an extension.
+  */
+function getControllingExtensionId(settingName) {
+  return ExtensionPreferencesManager.getControllingExtensionId(settingName);
+}
+
+function getControllingExtensionEl(settingName) {
+  return document.getElementById(extensionControlledContentIds[settingName]);
+}
+
+async function handleControllingExtension(prefName) {
+  let controllingExtensionId = await getControllingExtensionId(prefName);
+
+  if (controllingExtensionId) {
+    showControllingExtension(prefName, controllingExtensionId);
+  } else {
+    hideControllingExtension(prefName);
+  }
+
+  return !!controllingExtensionId;
+}
+
+async function showControllingExtension(settingName, extensionId) {
+  let extensionControlledContent = getControllingExtensionEl(settingName);
+  // Tell the user what extension is controlling the homepage.
+  let addon = await AddonManager.getAddonByID(extensionId);
+  const defaultIcon = "chrome://mozapps/skin/extensions/extensionGeneric.svg";
+  let stringParts = document
+    .getElementById("bundlePreferences")
+    .getString(`extensionControlled.${settingName}`)
+    .split("%S");
+  let description = extensionControlledContent.querySelector("description");
+
+  // Remove the old content from the description.
+  while (description.firstChild) {
+    description.firstChild.remove();
+  }
+
+  // Populate the description.
+  description.appendChild(document.createTextNode(stringParts[0]));
+  let image = document.createElement("image");
+  image.setAttribute("src", addon.iconURL || defaultIcon);
+  image.classList.add("extension-controlled-icon");
+  description.appendChild(image);
+  description.appendChild(document.createTextNode(` ${addon.name}`));
+  description.appendChild(document.createTextNode(stringParts[1]));
+
+  // Show the controlling extension row and hide the old label.
+  extensionControlledContent.hidden = false;
+}
+
+function hideControllingExtension(settingName) {
+  getControllingExtensionEl(settingName).hidden = true;
+}
+
 /**
  * An enumeration of items in a JS array.
  *
  * FIXME: use ArrayConverter once it lands (bug 380839).
  *
  * @constructor
  */
 function ArrayEnumerator(aItems) {
--- a/browser/components/preferences/in-content/main.xul
+++ b/browser/components/preferences/in-content/main.xul
@@ -343,16 +343,23 @@
 </groupbox>
 
 <!-- Home Page -->
 <groupbox id="homepageGroup"
           data-category="paneGeneral"
           hidden="true">
   <caption><label>&homepage2.label;</label></caption>
 
+  <hbox id="browserHomePageExtensionContent" align="center">
+    <description control="disableHomePageExtension" flex="1" />
+    <button id="disableHomePageExtension"
+            class="extension-controlled-button accessory-button"
+            label="&disableExtension.label;" />
+  </hbox>
+
   <vbox>
     <textbox id="browserHomePage"
              class="uri-element"
              type="autocomplete"
              autocompletesearch="unifiedcomplete"
              onsyncfrompreference="return gMainPane.syncFromHomePref();"
              onsynctopreference="return gMainPane.syncToHomePref(this.value);"
              placeholder="&abouthome.pageTitle;"
--- a/browser/components/preferences/in-content/tests/browser.ini
+++ b/browser/components/preferences/in-content/tests/browser.ini
@@ -1,13 +1,14 @@
 [DEFAULT]
 support-files =
   head.js
   privacypane_tests_perwindow.js
   site_data_test.html
+  addons/set_homepage.xpi
   offline/offline.html
   offline/manifest.appcache
 
 [browser_applications_selection.js]
 skip-if = os == 'linux' # bug 1382057
 [browser_advanced_update.js]
 skip-if = !updater
 [browser_basic_rebuild_fonts_test.js]
--- a/browser/components/preferences/in-content/tests/browser_homepages_filter_aboutpreferences.js
+++ b/browser/components/preferences/in-content/tests/browser_homepages_filter_aboutpreferences.js
@@ -1,9 +1,9 @@
-add_task(async function() {
+add_task(async function testSetHomepageUseCurrent() {
   is(gBrowser.currentURI.spec, "about:blank", "Test starts with about:blank open");
   await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:home");
   await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
   let doc = gBrowser.contentDocument;
   is(gBrowser.currentURI.spec, "about:preferences#general",
      "#general should be in the URI for about:preferences");
   let oldHomepagePref = Services.prefs.getCharPref("browser.startup.homepage");
 
@@ -13,8 +13,99 @@ add_task(async function() {
   is(gBrowser.tabs.length, 3, "Three tabs should be open");
   is(Services.prefs.getCharPref("browser.startup.homepage"), "about:blank|about:home",
      "about:blank and about:home should be the only homepages set");
 
   Services.prefs.setCharPref("browser.startup.homepage", oldHomepagePref);
   await BrowserTestUtils.removeTab(gBrowser.selectedTab);
   await BrowserTestUtils.removeTab(gBrowser.selectedTab);
 });
+
+const TEST_DIR = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
+const CHROME_URL_ROOT = TEST_DIR + "/";
+
+function getSupportsFile(path) {
+  let cr = Cc["@mozilla.org/chrome/chrome-registry;1"]
+    .getService(Ci.nsIChromeRegistry);
+  let uri = Services.io.newURI(CHROME_URL_ROOT + path);
+  let fileurl = cr.convertChromeURL(uri);
+  return fileurl.QueryInterface(Ci.nsIFileURL);
+}
+
+function installAddon() {
+  let filePath = getSupportsFile("addons/set_homepage.xpi").file;
+  return new Promise((resolve, reject) => {
+    AddonManager.getInstallForFile(filePath, install => {
+      if (!install) {
+        throw new Error(`An install was not created for ${filePath}`);
+      }
+      install.addListener({
+        onDownloadFailed: reject,
+        onDownloadCancelled: reject,
+        onInstallFailed: reject,
+        onInstallCancelled: reject,
+        onInstallEnded: resolve
+      });
+      install.install();
+    });
+  });
+}
+
+function waitForMessageChange(cb) {
+  return new Promise((resolve) => {
+    let target = gBrowser.contentDocument.getElementById("browserHomePageExtensionContent");
+    let observer = new MutationObserver(() => {
+      if (cb(target)) {
+        observer.disconnect();
+        resolve();
+      }
+    });
+    observer.observe(target, { attributes: true, attributeFilter: ["hidden"] });
+  });
+}
+
+function waitForMessageHidden() {
+  return waitForMessageChange(target => target.hidden);
+}
+
+function waitForMessageShown() {
+  return waitForMessageChange(target => !target.hidden);
+}
+
+add_task(async function testExtensionControlledHomepage() {
+  await openPreferencesViaOpenPreferencesAPI("paneGeneral", {leaveOpen: true});
+  let doc = gBrowser.contentDocument;
+  is(gBrowser.currentURI.spec, "about:preferences#general",
+     "#general should be in the URI for about:preferences");
+  let homepagePref = () => Services.prefs.getCharPref("browser.startup.homepage");
+  let originalHomepagePref = homepagePref();
+  let extensionHomepage = "https://developer.mozilla.org/";
+  let controlledContent = doc.getElementById("browserHomePageExtensionContent");
+
+  // The homepage is set to the default and editable.
+  ok(originalHomepagePref != extensionHomepage, "homepage is empty by default");
+  is(doc.getElementById("browserHomePage").disabled, false, "The homepage input is enabled");
+  is(controlledContent.hidden, true, "The extension controlled row is hidden");
+
+  // Install an extension that will set the homepage.
+  await installAddon();
+  await waitForMessageShown();
+
+  // The homepage has been set by the extension, the user is notified and it isn't editable.
+  let controlledLabel = controlledContent.querySelector("description");
+  is(homepagePref(), extensionHomepage, "homepage is set by extension");
+  // There are two spaces before "set_homepage" because it's " <image /> set_homepage".
+  is(controlledLabel.textContent, "An extension,  set_homepage, controls your home page.",
+     "The user is notified that an extension is controlling the homepage");
+  is(controlledContent.hidden, false, "The extension controlled row is hidden");
+  is(doc.getElementById("browserHomePage").disabled, true, "The homepage input is disabled");
+
+  // Disable the extension.
+  doc.getElementById("disableHomePageExtension").click();
+
+  await waitForMessageHidden();
+
+  is(homepagePref(), originalHomepagePref, "homepage is set back to default");
+  is(doc.getElementById("browserHomePage").disabled, false, "The homepage input is enabled");
+  is(controlledContent.hidden, true, "The extension controlled row is hidden");
+
+  await BrowserTestUtils.removeTab(gBrowser.selectedTab);
+});
--- a/browser/locales/en-US/chrome/browser/preferences/main.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/main.dtd
@@ -15,16 +15,18 @@
 <!ENTITY useCurrentPage.label      "Use Current Page">
 <!ENTITY useCurrentPage.accesskey  "C">
 <!ENTITY useMultiple.label         "Use Current Pages">
 <!ENTITY chooseBookmark.label      "Use Bookmark…">
 <!ENTITY chooseBookmark.accesskey  "B">
 <!ENTITY restoreDefault.label      "Restore to Default">
 <!ENTITY restoreDefault.accesskey  "R">
 
+<!ENTITY disableExtension.label    "Disable Extension">
+
 <!ENTITY downloads.label     "Downloads">
 
 <!ENTITY saveTo.label "Save files to">
 <!ENTITY saveTo.accesskey "v">
 <!ENTITY chooseFolderWin.label        "Browse…">
 <!ENTITY chooseFolderWin.accesskey    "o">
 <!ENTITY chooseFolderMac.label        "Choose…">
 <!ENTITY chooseFolderMac.accesskey    "e">
--- a/browser/locales/en-US/chrome/browser/preferences/preferences.properties
+++ b/browser/locales/en-US/chrome/browser/preferences/preferences.properties
@@ -272,8 +272,12 @@ searchInput.labelUnix=Find in Preference
 searchResults.sorryMessageWin=Sorry! There are no results in Options for “%S”.
 searchResults.sorryMessageUnix=Sorry! There are no results in Preferences for “%S”.
 # LOCALIZATION NOTE (searchResults.needHelp2): %1$S is a link to SUMO, %2$S is
 # the browser name
 searchResults.needHelp2=Need help? Visit <html:a id="need-help-link" target="_blank" href="%1$S">%2$S Support</html:a>
 
 # LOCALIZATION NOTE %S is the default value of the `dom.ipc.processCount` pref.
 defaultContentProcessCount=%S (default)
+
+# LOCALIZATION NOTE (extensionControlled.homepage_override):
+# This string is shown to notify the user that their home page is being controlled by an extension.
+extensionControlled.homepage_override = An extension, %S, controls your home page.
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -154,16 +154,23 @@ separator.thin:not([orient="vertical"]) 
 .homepage-button:first-of-type {
   margin-inline-start: 0;
 }
 
 .homepage-button:last-of-type {
   margin-inline-end: 0;
 }
 
+.extension-controlled-icon {
+  height: 20px;
+  margin-bottom: 6px;
+  vertical-align: bottom;
+  width: 20px;
+}
+
 #getStarted {
   font-size: 90%;
 }
 
 #downloadFolder {
   margin-inline-start: 0;
 }
 
--- a/toolkit/components/extensions/ExtensionPreferencesManager.jsm
+++ b/toolkit/components/extensions/ExtensionPreferencesManager.jsm
@@ -164,16 +164,29 @@ this.ExtensionPreferencesManager = {
    *
    * @returns {string|number|boolean} The default value of the preference.
    */
   getDefaultValue(prefName) {
     return defaultPreferences.get(prefName);
   },
 
   /**
+   * Gets the id of the extension controlling a preference or null if it isn't
+   * being controlled.
+   *
+   * @param {string} prefName The name of the preference.
+   *
+   * @returns {Promise} Resolves to the id of the extension, or null.
+   */
+  async getControllingExtensionId(prefName) {
+    await ExtensionSettingsStore.initialize();
+    return ExtensionSettingsStore.getTopExtensionId(STORE_TYPE, prefName);
+  },
+
+  /**
    * Indicates that an extension would like to change the value of a previously
    * defined setting.
    *
    * @param {Extension} extension
    *        The extension for which a setting is being set.
    * @param {string} name
    *        The unique id of the setting.
    * @param {any} value
--- a/toolkit/components/extensions/ExtensionSettingsStore.jsm
+++ b/toolkit/components/extensions/ExtensionSettingsStore.jsm
@@ -103,30 +103,30 @@ function ensureType(type) {
   }
 
   // Ensure a property exists for the given type.
   if (!_store.data[type]) {
     _store.data[type] = {};
   }
 }
 
-// Return an object with properties for key and value|initialValue, or null
-// if no setting has been stored for that key.
+// Return an object with properties for key, value|initialValue, id|null, or
+// null if no setting has been stored for that key.
 function getTopItem(type, key) {
   ensureType(type);
 
   let keyInfo = _store.data[type][key];
   if (!keyInfo) {
     return null;
   }
 
   // Find the highest precedence, enabled setting.
   for (let item of keyInfo.precedenceList) {
     if (item.enabled) {
-      return {key, value: item.value};
+      return {key, value: item.value, id: item.id};
     }
   }
 
   // Nothing found in the precedenceList, return the initialValue.
   return {key, initialValue: keyInfo.initialValue};
 }
 
 // Comparator used when sorting the precedence list.
@@ -286,17 +286,17 @@ this.ExtensionSettingsStore = {
 
     // Sort the list.
     keyInfo.precedenceList.sort(precedenceComparator);
 
     _store.saveSoon();
 
     // Check whether this is currently the top item.
     if (keyInfo.precedenceList[0].id == id) {
-      return {key, value};
+      return {id, key, value};
     }
     return null;
   },
 
   /**
    * Removes a setting from the store, possibly returning the current top
    * precedent setting.
    *
@@ -447,16 +447,26 @@ this.ExtensionSettingsStore = {
     }
 
     let addon = await AddonManager.getAddonByID(id);
     return topItem.installDate > addon.installDate.valueOf() ?
       "controlled_by_other_extensions" :
       "controllable_by_this_extension";
   },
 
+  // Return the id of the controlling extension or null if no extension is
+  // controlling this setting.
+  getTopExtensionId(type, key) {
+    let item = getTopItem(type, key);
+    if (item) {
+      return item.id;
+    }
+    return null;
+  },
+
   /**
    * Test-only method to force reloading of the JSON file.
    *
    * Note that this method simply clears the local variable that stores the
    * file, so the next time the file is accessed it will be reloaded.
    *
    * @returns {Promise}
    *          A promise that resolves once the settings store has been cleared.
--- a/toolkit/components/extensions/test/xpcshell/test_ext_extensionSettingsStore.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_extensionSettingsStore.js
@@ -17,24 +17,24 @@ AddonTestUtils.init(this);
 
 // Allow for unsigned addons.
 AddonTestUtils.overrideCertDB();
 
 createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "42");
 
 const ITEMS = {
   key1: [
-    {key: "key1", value: "val1"},
-    {key: "key1", value: "val2"},
-    {key: "key1", value: "val3"},
+    {key: "key1", value: "val1", id: "@first"},
+    {key: "key1", value: "val2", id: "@second"},
+    {key: "key1", value: "val3", id: "@third"},
   ],
   key2: [
-    {key: "key2", value: "val1-2"},
-    {key: "key2", value: "val2-2"},
-    {key: "key2", value: "val3-2"},
+    {key: "key2", value: "val1-2", id: "@first"},
+    {key: "key2", value: "val2-2", id: "@second"},
+    {key: "key2", value: "val3-2", id: "@third"},
   ],
 };
 const KEY_LIST = Object.keys(ITEMS);
 const TEST_TYPE = "myType";
 
 let callbackCount = 0;
 
 function initialValue(key) {
@@ -44,25 +44,31 @@ function initialValue(key) {
 
 add_task(async function test_settings_store() {
   await promiseStartupManager();
 
   // Create an array of test framework extension wrappers to install.
   let testExtensions = [
     ExtensionTestUtils.loadExtension({
       useAddonManager: "temporary",
-      manifest: {},
+      manifest: {
+        applications: {gecko: {id: "@first"}},
+      },
     }),
     ExtensionTestUtils.loadExtension({
       useAddonManager: "temporary",
-      manifest: {},
+      manifest: {
+        applications: {gecko: {id: "@second"}},
+      },
     }),
     ExtensionTestUtils.loadExtension({
       useAddonManager: "temporary",
-      manifest: {},
+      manifest: {
+        applications: {gecko: {id: "@third"}},
+      },
     }),
   ];
 
   for (let extension of testExtensions) {
     await extension.startup();
   }
 
   // Create an array actual Extension objects which correspond to the
@@ -296,17 +302,17 @@ add_task(async function test_settings_st
       "getSetting returns correct item after a removal.");
     levelOfControl = await ExtensionSettingsStore.getLevelOfControl(extensions[2], TEST_TYPE, key);
     equal(
       levelOfControl,
       "controllable_by_this_extension",
       "getLevelOfControl returns correct levelOfControl after removal of top item.");
 
     // Add a setting for the current top item.
-    let itemToAdd = {key, value: `new-${key}`};
+    let itemToAdd = {key, value: `new-${key}`, id: "@second"};
     item = await ExtensionSettingsStore.addSetting(
       extensions[1], TEST_TYPE, itemToAdd.key, itemToAdd.value, initialValue);
     equal(callbackCount,
       expectedCallbackCount,
       "initialValueCallback called the expected number of times.");
     deepEqual(
       item,
       itemToAdd,
author	Mark Striemer <mstriemer@mozilla.com>
	Thu, 07 Sep 2017 11:35:06 -0500
changeset 664359	8392c7e9cde4d847304624265a43410e1c75f1aa
parent 662425	b7f103d256b97191fe58277fbb14028a9f5f8819
child 731431	9896a2273c9ec36f0b71659e7728674468d9d7c4
push id	79682
push user	bmo:mstriemer@mozilla.com
push date	Wed, 13 Sep 2017 21:34:16 +0000
reviewers	bsilverberg, jaws
bugs	1354344
milestone	57.0a1
browser/components/preferences/in-content/main.js		file \| annotate \| diff \| comparison \| revisions
browser/components/preferences/in-content/main.xul		file \| annotate \| diff \| comparison \| revisions
browser/components/preferences/in-content/tests/addons/set_homepage.xpi		file \| annotate \| diff \| comparison \| revisions
browser/components/preferences/in-content/tests/browser.ini		file \| annotate \| diff \| comparison \| revisions
browser/components/preferences/in-content/tests/browser_homepages_filter_aboutpreferences.js		file \| annotate \| diff \| comparison \| revisions
browser/locales/en-US/chrome/browser/preferences/main.dtd		file \| annotate \| diff \| comparison \| revisions
browser/locales/en-US/chrome/browser/preferences/preferences.properties		file \| annotate \| diff \| comparison \| revisions
browser/themes/shared/incontentprefs/preferences.inc.css		file \| annotate \| diff \| comparison \| revisions
toolkit/components/extensions/ExtensionPreferencesManager.jsm		file \| annotate \| diff \| comparison \| revisions
toolkit/components/extensions/ExtensionSettingsStore.jsm		file \| annotate \| diff \| comparison \| revisions
toolkit/components/extensions/test/xpcshell/test_ext_extensionSettingsStore.js		file \| annotate \| diff \| comparison \| revisions