Bug 1253233 - Make preparations to allow testing of remote browser elements in mochitest-chrome tests. r=felipe
authorMike de Boer <mdeboer@mozilla.com>
Fri, 11 Mar 2016 19:27:17 +0100
changeset 289866 77f49b7742911b5e47744b8dd3c5bc4475bb4205
parent 289865 0714a2e98d5e090b310742d588ac6f53c125a8dd
child 289867 f6c028e4f604b518e0cb0c8b7400a57b25300fe5
push id30111
push usercbook@mozilla.com
push dateWed, 23 Mar 2016 09:49:28 +0000
treeherdermozilla-central@efe7d026ac64 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfelipe
bugs1253233
milestone48.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 1253233 - Make preparations to allow testing of remote browser elements in mochitest-chrome tests. r=felipe
testing/mochitest/tests/SimpleTest/test.css
toolkit/content/widgets/remote-browser.xml
--- a/testing/mochitest/tests/SimpleTest/test.css
+++ b/testing/mochitest/tests/SimpleTest/test.css
@@ -32,8 +32,12 @@
 }
 
 .tests_report {
   border-width: 2px;
   border-style: solid;
   width: 20em;
   display: table;
 }
+
+browser[remote="true"] {
+  -moz-binding: url("chrome://global/content/bindings/remote-browser.xml#remote-browser");
+}
--- a/toolkit/content/widgets/remote-browser.xml
+++ b/toolkit/content/widgets/remote-browser.xml
@@ -72,17 +72,17 @@
       	  <![CDATA[
             if (!this._remoteWebProgress) {
               // Don't attempt to create the remote web progress if the
               // messageManager has already gone away
               if (!this.messageManager)
                 return null;
 
               let jsm = "resource://gre/modules/RemoteWebProgress.jsm";
-              let { RemoteWebProgressManager } = Cu.import(jsm, {});
+              let { RemoteWebProgressManager } = Components.utils.import(jsm, {});
               this._remoteWebProgressManager = new RemoteWebProgressManager(this);
               this._remoteWebProgress = this._remoteWebProgressManager.topLevelWebProgress;
             }
             return this._remoteWebProgress;
       	  ]]>
       	</getter>
       </property>
 
@@ -92,17 +92,17 @@
         <getter><![CDATA[
           if (!this._remoteFinder) {
             // Don't attempt to create the remote finder if the
             // messageManager has already gone away
             if (!this.messageManager)
               return null;
 
             let jsm = "resource://gre/modules/RemoteFinder.jsm";
-            let { RemoteFinder } = Cu.import(jsm, {});
+            let { RemoteFinder } = Components.utils.import(jsm, {});
             this._remoteFinder = new RemoteFinder(this);
           }
           return this._remoteFinder;
         ]]></getter>
       </property>
 
       <field name="_documentURI">null</field>