Bug 1079130 - Modify AppWindowManager to appWindowManager in Gecko. r=jgriffin
authorGeorge Duan <gduan@mozilla.com>
Wed, 08 Oct 2014 00:57:00 +0200
changeset 232842 3e4dfbe6e871f9362671fa3e34104c1824523cf9
parent 232841 e7416e48eb312894489234d004d89a57c82a0f9d
child 232843 d993a62ce8db26602ab3dc1b78168ebb6cc50dd1
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 17:57:20 +0000
reviewersjgriffin
bugs1079130
milestone35.0a1
Bug 1079130 - Modify AppWindowManager to appWindowManager in Gecko. r=jgriffin
testing/marionette/client/marionette/marionette_test.py
testing/web-platform/harness/wptrunner/browsers/b2g.py
--- a/testing/marionette/client/marionette/marionette_test.py
+++ b/testing/marionette/client/marionette/marionette_test.py
@@ -474,17 +474,17 @@ if((navigator.mozSettings == undefined) 
 let setReq = navigator.mozSettings.createLock().set({'lockscreen.enabled': false});
 setReq.onsuccess = function() {
     let appsReq = navigator.mozApps.mgmt.getAll();
     appsReq.onsuccess = function() {
         let apps = appsReq.result;
         for (let i = 0; i < apps.length; i++) {
             let app = apps[i];
             if (app.manifest.name === 'Test Container') {
-                let manager = window.wrappedJSObject.AppWindowManager || window.wrappedJSObject.WindowManager;
+                let manager = window.wrappedJSObject.appWindowManager || window.wrappedJSObject.AppWindowManager;
                 if (!manager) {
                     marionetteScriptFinished(false);
                     return;
                 }
                 manager.kill(app.origin);
                 marionetteScriptFinished(true);
                 return;
             }
--- a/testing/web-platform/harness/wptrunner/browsers/b2g.py
+++ b/testing/web-platform/harness/wptrunner/browsers/b2g.py
@@ -228,17 +228,17 @@ class B2GExecutorBrowser(ExecutorBrowser
     def use_cert_app(self):
         """Start the app used to run the tests"""
         self.executor.logger.info("Homescreen loaded")
         self.gaia_apps.launch("CertTest App")
 
     def wait_for_homescreen(self, timeout):
         self.executor.logger.info("Waiting for homescreen")
         self.marionette.execute_async_script("""
-let manager = window.wrappedJSObject.AppWindowManager || window.wrappedJSObject.WindowManager;
+let manager = window.wrappedJSObject.appWindowManager || window.wrappedJSObject.AppWindowManager;
 let app = null;
 if (manager) {
   app = ('getActiveApp' in manager) ? manager.getActiveApp() : manager.getCurrentDisplayedApp();
 }
 if (app) {
   log('Already loaded home screen');
   marionetteScriptFinished();
 } else {