Bug 451283 - Bustage fix for Marrionette. r=bustage
☠☠ backed out by c3dc4019b6f7 ☠ ☠
authorBlair McBride <bmcbride@mozilla.com>
Sat, 12 Oct 2013 18:27:24 +1300
changeset 164392 1ee5030003af967b463474742f1151f2e4174491
parent 164391 2f67ed3d7d6c8322c29a8c692736008defaf560f
child 164393 c3dc4019b6f7776dc1e69ccd591b37e11f89d533
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs451283
milestone27.0a1
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
Bug 451283 - Bustage fix for Marrionette. r=bustage
testing/marionette/marionette-frame-manager.js
--- a/testing/marionette/marionette-frame-manager.js
+++ b/testing/marionette/marionette-frame-manager.js
@@ -5,17 +5,17 @@
 this.EXPORTED_SYMBOLS = [
   "FrameManager"
 ];
 
 let FRAME_SCRIPT = "chrome://marionette/content/marionette-listener.js";
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
-Cu.import("resource://gre/modules/services-common/Log.js");
+Cu.import("resource://gre/modules/Log.js");
 let logger = Log.repository.getLogger("Marionette");
 
 //list of OOP frames that has the frame script loaded
 let remoteFrames = [];
 
 /**
  * An object representing a frame that Marionette has loaded a
  * frame script in.