Backed out changeset d129d66a6491 (bug 812281) because apparently it broke Android reftest/crashtest/jsreftest
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 15 Nov 2012 14:35:41 -0800
changeset 113417 38a94424d2234aba78e1ea04f2f33430fd50cb69
parent 113416 8fc83f490e0c48f13e838b3ec0c2d990abec4175
child 113418 b88cc468573471024fa4404004ace9a83613e7a0
push id18142
push usereakhgari@mozilla.com
push dateThu, 15 Nov 2012 22:35:48 +0000
treeherdermozilla-inbound@38a94424d223 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs812281
milestone19.0a1
backs outd129d66a6491616aed3b09a0c918709b5866f98a
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset d129d66a6491 (bug 812281) because apparently it broke Android reftest/crashtest/jsreftest
build/automation.py.in
layout/tools/reftest/bootstrap.js
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -450,19 +450,16 @@ user_pref("extensions.getAddons.getWithP
 user_pref("extensions.getAddons.search.browseURL", "http://%(server)s/extensions-dummy/repositoryBrowseURL");
 user_pref("extensions.getAddons.search.url", "http://%(server)s/extensions-dummy/repositorySearchURL");
 
 // Make enablePrivilege continue to work for test code. :-(
 user_pref("security.turn_off_all_security_so_that_viruses_can_take_over_this_computer", true);
 
 // Get network events.
 user_pref("network.activity.blipIntervalMilliseconds", 250);
-
-// Shut up the media volume level.
-user_pref("media.volume_scale", "0.05");
 """ % { "server" : self.webServer + ":" + str(self.httpPort) }
     prefs.append(part)
 
     if useServerLocations:
       # We need to proxy every server but the primary one.
       origins = ["'%s://%s:%s'" % (l.scheme, l.host, l.port)
                 for l in filter(lambda l: "primary" not in l.options, locations)]
       origins = ", ".join(origins)
--- a/layout/tools/reftest/bootstrap.js
+++ b/layout/tools/reftest/bootstrap.js
@@ -28,18 +28,16 @@ function setDefaultPrefs() {
     branch.setBoolPref("extensions.update.enabled", false);
     branch.setBoolPref("extensions.getAddons.cache.enabled", false);
     // Disable blocklist updates so we don't have them reported as leaks
     branch.setBoolPref("extensions.blocklist.enabled", false);
     // Make url-classifier updates so rare that they won't affect tests
     branch.setIntPref("urlclassifier.updateinterval", 172800);
     // Disable high-quality downscaling, since it makes reftests more difficult.
     branch.setBoolPref("image.high_quality_downscaling.enabled", false);
-    // Shut up the media prefs when running tests.
-    branch.setIntPref("media.volume_scale", "0.05");
 }
 
 var windowListener = {
     onOpenWindow: function(aWindow) {
         let domWindow = aWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIDOMWindowInternal || Components.interfaces.nsIDOMWindow);
         domWindow.addEventListener("load", function() {
             domWindow.removeEventListener("load", arguments.callee, false);