Backed out changeset 622c510957bb (bug 915260) in the hope that it is responsible for the B2G mochitest-7 failure, rather than the external repo changes CLOSED TREE
authorEd Morley <emorley@mozilla.com>
Thu, 12 Sep 2013 14:09:02 +0100
changeset 160717 3a2267219f35162863bdf8c8a78b6e3788140e62
parent 160716 54401d0bc1dab5ffa65a2b62940c98e806efe4d2
child 160718 08b48fded7bb395a997f61786d1de624e94852e4
push id407
push userlsblakk@mozilla.com
push dateTue, 03 Dec 2013 03:32:50 +0000
treeherdermozilla-release@babf8c9ebc52 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs915260
milestone26.0a1
backs out622c510957bb22a3b3e826f4fa0181c0bc18acfe
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 622c510957bb (bug 915260) in the hope that it is responsible for the B2G mochitest-7 failure, rather than the external repo changes CLOSED TREE
b2g/chrome/content/settings.js
b2g/components/WebappsUpdater.jsm
--- a/b2g/chrome/content/settings.js
+++ b/b2g/chrome/content/settings.js
@@ -313,19 +313,17 @@ let AdbController = {
         this.debug("updateState: Waiting for all vars to be initialized");
       }
       return;
     }
 
     // Check if we have a remote debugging session going on. If so, we won't
     // disable adb even if the screen is locked.
     let isDebugging = Object.keys(DebuggerServer._connections).length > 0;
-    if (this.DEBUG) {
-      this.debug("isDebugging=" + isDebugging);
-    }
+    this.debug("isDebugging=" + isDebugging);
 
     let enableAdb = this.remoteDebuggerEnabled &&
       (!(this.lockEnabled && this.locked) || isDebugging);
 
     let useDisableAdbTimer = true;
     try {
       if (Services.prefs.getBoolPref("marionette.defaultPrefs.enabled")) {
         // Marionette is enabled. Marionette requires that adb be on (and also
--- a/b2g/components/WebappsUpdater.jsm
+++ b/b2g/components/WebappsUpdater.jsm
@@ -4,27 +4,18 @@
 
 "use strict";
 
 this.EXPORTED_SYMBOLS = ["WebappsUpdater"];
 
 const Cc = Components.classes;
 const Cu = Components.utils;
 
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-XPCOMUtils.defineLazyServiceGetter(this, "settings",
-                                   "@mozilla.org/settingsService;1",
-                                   "nsISettingsService");
-
-function debug(aStr) {
-  //dump("--*-- WebappsUpdater: " + aStr);
-}
-
 this.WebappsUpdater = {
   _checkingApps: false,
   _pendingEvents: [],
 
   handleContentStart: function(aShell) {
     let content = aShell.contentBrowser.contentWindow;
     this._pendingEvents.forEach(aShell.sendChromeEvent);
 
@@ -33,37 +24,37 @@ this.WebappsUpdater = {
 
   sendChromeEvent: function(aType, aDetail) {
     let detail = aDetail || {};
     detail.type = aType;
 
     let browser = Services.wm.getMostRecentWindow("navigator:browser");
     if (!browser) {
       this._pendingEvents.push(detail);
-      debug("Warning: Couldn't send update event " + aType +
+      dump("Warning: Couldn't send update event " + aType +
           ": no content browser. Will send again when content becomes available.");
       return false;
     }
 
     browser.shell.sendChromeEvent(detail);
     return true;
   },
 
   _appsUpdated: function(aApps) {
-    debug("appsUpdated: " + aApps.length + " apps to update");
-    let lock = settings.createLock();
+    dump("appsUpdated: " + aApps.length + " apps to update");
+    let lock = Services.settings.createLock();
     lock.set("apps.updateStatus", "check-complete", null);
     this.sendChromeEvent("apps-update-check", { apps: aApps });
     this._checkingApps = false;
   },
 
   // Trigger apps update check and wait for all to be done before
   // notifying gaia.
   updateApps: function() {
-    debug("updateApps (" + this._checkingApps + ")");
+    dump("updateApps (" + this._checkingApps + ")");
     // Don't start twice.
     if (this._checkingApps) {
       return;
     }
 
     this._checkingApps = true;
 
     let self = this;