Bug 897811 - remove browser.pageThumbs.enabled preference. r=gavin

browser/base/content/browser-thumbnails.js

@@ -35,11 +35,6 @@ let gBrowserThumbnails = {
     if (gMultiProcessBrowser)
       return;
 
-    try {
-      if (Services.prefs.getBoolPref("browser.pagethumbnails.capturing_disabled"))
-        return;
-    } catch (e) {}
-
     PageThumbs.addExpirationFilter(this);
     gBrowser.addTabsProgressListener(this);
     Services.prefs.addObserver(this.PREF_DISK_CACHE_SSL, this, false);

content/base/test/test_ipc_messagemanager_blob.html

@@ -96,7 +96,7 @@
         "set": [
           ["dom.ipc.browser_frames.oop_by_default", true],
           ["dom.mozBrowserFramesEnabled", true],
-          ["browser.pageThumbs.enabled", false]
+          ["browser.pagethumbnails.capturing_disabled", false]
         ]
       }, runTests);
     });

content/media/webspeech/synth/ipc/test/test_ipc.html

@@ -181,7 +181,7 @@
 
           ["dom.ipc.browser_frames.oop_by_default", true],
           ["dom.mozBrowserFramesEnabled", true],
-          ["browser.pageThumbs.enabled", false]
+          ["browser.pagethumbnails.capturing_disabled", false]
         ]
       }, runTests);
     });

dom/browser-element/mochitest/browserElementTestHelpers.js

@@ -206,7 +206,7 @@ function expectMozbrowserEvent(iframe, eventName) {
 
 // Set some prefs:
 //
-//  * browser.pageThumbs.enabled: false
+//  * browser.pagethumbnails.capturing_disabled: false
 //
 //    Disable tab view; it seriously messes us up.
 //
@@ -244,7 +244,7 @@ function expectMozbrowserEvent(iframe, eventName) {
 
   browserElementTestHelpers.lockTestReady();
   SpecialPowers.setBoolPref("network.disable.ipc.security", true);
-  SpecialPowers.pushPrefEnv({set: [["browser.pageThumbs.enabled", false],
+  SpecialPowers.pushPrefEnv({set: [["browser.pagethumbnails.capturing_disabled", false],
                                    ["dom.ipc.browser_frames.oop_by_default", oop],
                                    ["dom.ipc.tabs.disabled", false],
                                    ["security.mixed_content.block_active_content", false]]},

dom/devicestorage/ipc/test_ipc.html

@@ -158,7 +158,7 @@
 
           ["dom.ipc.browser_frames.oop_by_default", true],
           ["dom.mozBrowserFramesEnabled", true],
-          ["browser.pageThumbs.enabled", false]
+          ["browser.pagethumbnails.capturing_disabled", false]
         ]
       }, runTests);
     });

layout/tools/reftest/reftest-cmdline.js

@@ -105,8 +105,8 @@ RefTestCmdLineHandler.prototype =
     // Checking whether two files are the same is slow on Windows.
     // Setting this pref makes tests run much faster there.
     branch.setBoolPref("security.fileuri.strict_origin_policy", false);
-    // Disable the background thumbnailing service
-    branch.setBoolPref("browser.pageThumbs.enabled", false);
+    // Disable the thumbnailing service
+    branch.setBoolPref("browser.pagethumbnails.capturing_disabled", false);
 
     var wwatch = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
                            .getService(nsIWindowWatcher);

testing/profiles/prefs_general.js

@@ -147,4 +147,4 @@ user_pref("geo.provider.testing", true);
 
 // Background thumbnails in particular cause grief, and disabling thumbnails
 // in general can't hurt - we re-enable them when tests need them.
-user_pref("browser.pageThumbs.enabled", false);
+user_pref("browser.pagethumbnails.capturing_disabled", false);

toolkit/components/thumbnails/PageThumbs.jsm

@@ -453,7 +453,7 @@ this.PageThumbs = {
 
   _prefEnabled: function PageThumbs_prefEnabled() {
     try {
-      return Services.prefs.getBoolPref("browser.pageThumbs.enabled");
+      return Services.prefs.getBoolPref("browser.pagethumbnails.capturing_disabled");
     }
     catch (e) {
       return true;

toolkit/components/thumbnails/test/head.js

@@ -10,13 +10,13 @@ let {PageThumbs, PageThumbsStorage, SessionStore, FileUtils, OS} = tmp;
 
 Cu.import("resource://gre/modules/PlacesUtils.jsm");
 
-let oldEnabledPref = Services.prefs.getBoolPref("browser.pageThumbs.enabled");
-Services.prefs.setBoolPref("browser.pageThumbs.enabled", true);
+let oldEnabledPref = Services.prefs.getBoolPref("browser.pagethumbnails.capturing_disabled");
+Services.prefs.setBoolPref("browser.pagethumbnails.capturing_disabled", true);
 
 registerCleanupFunction(function () {
   while (gBrowser.tabs.length > 1)
     gBrowser.removeTab(gBrowser.tabs[1]);
-  Services.prefs.setBoolPref("browser.pageThumbs.enabled", oldEnabledPref)
+  Services.prefs.setBoolPref("browser.pagethumbnails.capturing_disabled", oldEnabledPref)
 });
 
 /**