Bug 738797 - Enable the in-content preferences by default. r=Unfocused

--HG--
extra : rebase_source : 4c06ec299a082f4a2c587fe5cbeff3b0e5b21548

browser/app/profile/firefox.js

@@ -811,11 +811,7 @@ pref("plugin.state.f5 sam inspection host plugin", 2);
 // display door hanger if flash not installed
 pref("plugins.notifyMissingFlash", true);
 
-#ifdef XP_WIN
-pref("browser.preferences.instantApply", false);
-#else
 pref("browser.preferences.instantApply", true);
-#endif
 #ifdef XP_MACOSX
 pref("browser.preferences.animateFadeIn", true);
 #else
@@ -823,7 +819,7 @@ pref("browser.preferences.animateFadeIn", false);
 #endif
 
 // Toggles between the two Preferences implementations, pop-up window and in-content
-pref("browser.preferences.inContent", false);
+pref("browser.preferences.inContent", true);
 
 pref("browser.download.show_plugins_in_list", true);
 pref("browser.download.hide_plugins_without_extensions", true);

browser/base/content/test/general/browser_datareporting_notification.js

@@ -99,10 +99,7 @@ function test_multiple_windows() {
     ok(notification2, "2nd window has a global notification box.");
 
     let policy;
-
     let displayCount = 0;
-    let prefPaneClosed = false;
-    let childWindowClosed = false;
 
     function onAlertDisplayed() {
       displayCount++;
@@ -113,26 +110,6 @@ function test_multiple_windows() {
 
       ok(true, "Data reporting info bar displayed on all open windows.");
 
-      // We register two independent observers and we need both to clean up
-      // properly. This handles gating for test completion.
-      function maybeFinish() {
-        if (!prefPaneClosed) {
-          dump("Not finishing test yet because pref pane isn't closed.\n");
-          return;
-        }
-
-        if (!childWindowClosed) {
-          dump("Not finishing test yet because child window isn't closed.\n");
-          return;
-        }
-
-        dump("Finishing multiple window test.\n");
-        rootLogger.removeAppender(dumpAppender);
-        delete dumpAppender;
-        delete rootLogger;
-        finish();
-      }
-
       let closeCount = 0;
       function onAlertClose() {
         closeCount++;
@@ -150,10 +127,6 @@ function test_multiple_windows() {
            "Policy records reason for acceptance was button press.");
         is(notification1.allNotifications.length, 0, "No notifications remain on main window.");
         is(notification2.allNotifications.length, 0, "No notifications remain on 2nd window.");
-
-        window2.close();
-        childWindowClosed = true;
-        maybeFinish();
       }
 
       waitForNotificationClose(notification1.currentNotification, onAlertClose);
@@ -172,10 +145,16 @@ function test_multiple_windows() {
 
         ok(true, "Pref pane opened on info bar button press.");
         executeSoon(function soon() {
+          window2.close();
+
           dump("Closing pref pane.\n");
           prefWin.close();
-          prefPaneClosed = true;
-          maybeFinish();
+
+          dump("Finishing multiple window test.\n");
+          rootLogger.removeAppender(dumpAppender);
+          delete dumpAppender;
+          delete rootLogger;
+          finish();
         });
       }, "advanced-pane-loaded", false);
 

browser/base/content/test/general/browser_offlineQuotaNotification.js

@@ -38,6 +38,11 @@ function checkPreferences(prefsWin) {
 }
 
 function test() {
+  if (Services.prefs.getBoolPref("browser.preferences.inContent")) {
+    // Bug 881576 - ensure this works with inContent prefs.
+    todo(false, "Bug 881576 - this test needs to be updated for inContent prefs");
+    return;
+  }
   waitForExplicitFinish();
   gBrowser.selectedBrowser.addEventListener("load", function onload() {
     gBrowser.selectedBrowser.removeEventListener("load", onload, true);
@@ -50,10 +55,6 @@ function test() {
         // window to open - which we track either via a window watcher (for
         // the window-based prefs) or via an "Initialized" event (for
         // in-content prefs.)
-        if (Services.prefs.getBoolPref("browser.preferences.inContent")) {
-          // Bug 881576 - ensure this works with inContent prefs.
-          todo(false, "Bug 881576 - this test needs to be updated for inContent prefs");
-        } else {
         Services.ww.registerNotification(function wwobserver(aSubject, aTopic, aData) {
           if (aTopic != "domwindowopened")
             return;
@@ -61,7 +62,6 @@ function test() {
           checkPreferences(aSubject);
         });
         PopupNotifications.panel.firstElementChild.button.click();
-        }
       });
     };
     Services.prefs.setIntPref("offline-apps.quota.warn", 1);