Bug 1456035: Fix robocop bustage. r=bustage
authorKris Maglione <maglione.k@gmail.com>
Fri, 27 Apr 2018 17:13:19 -0700
changeset 416162 ce1d5d55b9a4de3b1bff8cec17b2895a5b83e73a
parent 416161 23d3d208fcaaeb67b79380d4b514f9785cc57a72
child 416163 eb451c84fd3cb87276884c5ef478584472dbdafd
push id33917
push userapavel@mozilla.com
push dateSat, 28 Apr 2018 17:30:55 +0000
treeherdermozilla-central@08f68e2c892c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1456035
milestone61.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 1456035: Fix robocop bustage. r=bustage MozReview-Commit-ID: HeCbltjaEBh
mobile/android/tests/browser/robocop/testAndroidCastDeviceProvider.js
--- a/mobile/android/tests/browser/robocop/testAndroidCastDeviceProvider.js
+++ b/mobile/android/tests/browser/robocop/testAndroidCastDeviceProvider.js
@@ -46,17 +46,17 @@ function TestDescription(aType, aTcpAddr
       .createInstance(Ci.nsISupportsCString);
     wrapper.data = address;
     this.tcpAddress.appendElement(wrapper);
   }
   this.tcpPort = aTcpPort;
 }
 
 TestDescription.prototype = {
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationChannelDescription]),
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationChannelDescription]),
 };
 
 function TestControlChannelListener(aRole) {
   log("TestControlChannelListener of " + aRole + " is created.");
   this._role = aRole;
   this.isNotifyConnectedCalled = new Promise((aResolve) => {
     this._isNotifyConnectedCalledResolve = aResolve;
   });
@@ -86,17 +86,17 @@ TestControlChannelListener.prototype = {
   isOnAnswerCalled: null,
   isOnIceCandidateCalled: null,
   isNotifyDisconnectedCalled: null,
   notifyConnected: function() { this._isNotifyConnectedCalledResolve(); },
   notifyDisconnected: function(aReason) { log(this._role + " call disconnect"); this._isNotifyDisconnectedCalledResolve(); },
   onOffer: function(aOffer) { this._isOnOfferCalledResolve(); },
   onAnswer: function(aAnswer) { this._isOnAnswerCalledResolve(); },
   onIceCandidate: function(aCandidate) { this._isOnIceCandidateCalledResolve(); },
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlChannelListener])
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlChannelListener])
 };
 
 function deviceManagement() {
   do_test_pending();
 
   let provider = Cc[DEVICE_PROVIDER_CONTRACT_ID].createInstance(Ci.nsIPresentationDeviceProvider);
   let listener = {
     devices: {},
@@ -113,18 +113,18 @@ function deviceManagement() {
     updateDevice: function(aDevice) {
       this.devices[aDevice.id] = aDevice;
       this._isUpdateDeviceCalledResolve();
     },
     removeDevice: function(aDevice) {
       delete this.devices[aDevice.id];
       this._isRemoveDeviceCalledResolve();
     },
-    QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDeviceListener,
-                                            Ci.nsISupportsWeakReference]),
+    QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDeviceListener,
+                                           Ci.nsISupportsWeakReference]),
     count: function() {
       let cnt = 0;
       for (let key in this.devices) {
         if (this.devices.hasOwnProperty(key)) {
           ++cnt;
         }
       }
       return cnt;
@@ -199,18 +199,18 @@ function presentationLaunchAndTerminate(
   let receiverControlChannelListener = new TestControlChannelListener("receiver");
 
   let provider = Cc[DEVICE_PROVIDER_CONTRACT_ID].createInstance(Ci.nsIPresentationDeviceProvider);
   let listener = {
     devices: {},
     addDevice: function(aDevice) { this.devices[aDevice.id] = aDevice; },
     updateDevice: function(aDevice) { this.devices[aDevice.id] = aDevice; },
     removeDevice: function(aDevice) { delete this.devices[aDevice.id]; },
-    QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDeviceListener,
-                                            Ci.nsISupportsWeakReference]),
+    QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDeviceListener,
+                                           Ci.nsISupportsWeakReference]),
     onSessionRequest: function(aDeviceId, aUrl, aPresentationId, aControlChannel) {
       receiverControlChannel = aControlChannel;
       receiverControlChannel.listener = receiverControlChannelListener;
     },
     onTerminateRequest: function(aDevice, aPresentationId, aControlChannel, aIsFromReceiver) {
       receiverControlChannel = aControlChannel;
       receiverControlChannel.listener = receiverControlChannelListener;
     },