Merging backout of rev 17abd3beeabf

browser/base/content/test/Makefile.in

@@ -105,7 +105,6 @@ _BROWSER_FILES = browser_sanitize-timespans.js \
                  browser_bug479408.js \
                  browser_bug479408_sample.html \
                  browser_scope.js \
-                 browser_bug419612.js \
     $(NULL)
 
 ifeq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))

browser/base/content/test/browser_bug419612.js

@@ -1,33 +0,0 @@
-function test() {
-  waitForExplicitFinish();
-
-  let testPage = "http://example.org/browser/browser/base/content/test/dummy_page.html";
-  let prefService = Components.classes["@mozilla.org/preferences-service;1"]
-                              .getService(Components.interfaces.nsIPrefBranch);
-  let tab1 = gBrowser.selectedTab = gBrowser.addTab();
-  tab1.linkedBrowser.addEventListener("load", (function(event) {
-    event.currentTarget.removeEventListener("load", arguments.callee, true);
-    let tab2 = gBrowser.addTab();
-    tab2.linkedBrowser.addEventListener("load", (function(event) {
-      event.currentTarget.removeEventListener("load", arguments.callee, true);
-      let oldPref = prefService.getBoolPref("browser.zoom.updateBackgroundTabs");
-      FullZoom.enlarge();
-      let tab1Zoom = ZoomManager.getZoomForBrowser(tab1.linkedBrowser);
-      gBrowser.selectedTab = tab2;
-      let tab2Zoom = ZoomManager.getZoomForBrowser(tab2.linkedBrowser);
-      is(tab2Zoom, tab1Zoom, "Zoom should affect background tabs");
-      prefService.setBoolPref("browser.zoom.updateBackgroundTabs", false);
-      FullZoom.reset();
-      gBrowser.selectedTab = tab1;
-      tab1Zoom = ZoomManager.getZoomForBrowser(tab1.linkedBrowser);
-      tab2Zoom = ZoomManager.getZoomForBrowser(tab2.linkedBrowser);
-      isnot(tab1Zoom, tab2Zoom, "Zoom should not affect background tabs");
-      prefService.setBoolPref("browser.zoom.updateBackgroundTabs", oldPref);
-      gBrowser.removeTab(tab1);
-      gBrowser.removeTab(tab2);
-      finish();
-    }), true);
-    tab2.linkedBrowser.loadURI(testPage);
-  }), true);
-  content.location = testPage;
-}