Bug 1073215: deal with conflict from uplifts rs=merge-fix a=loop-only
authorRandell Jesup <rjesup@jesup.org>
Fri, 07 Nov 2014 17:19:16 -0500
changeset 233797 e41fbb567e15d86068222cb2bf6e8253e5af15c8
parent 233796 22f120e4a68f5a1e06f7feea2177f8762e1213bc
child 233798 5b7c6ca135ebd39564fdbe2c38e3145309d9c373
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge-fix, loop-only
bugs1073215
milestone35.0a2
Bug 1073215: deal with conflict from uplifts rs=merge-fix a=loop-only
browser/components/loop/test/mochitest/head.js
--- a/browser/components/loop/test/mochitest/head.js
+++ b/browser/components/loop/test/mochitest/head.js
@@ -14,17 +14,17 @@ const {LoopRooms} = Cu.import("resource:
 // if offline mode is requested multiple times in a test run.
 const WAS_OFFLINE = Services.io.offline;
 
 var gMozLoopAPI;
 
 function promiseGetMozLoopAPI() {
   return new Promise((resolve, reject) => {
     let loopPanel = document.getElementById("loop-notification-panel");
-    let btn = document.getElementById("loop-call-button");
+    let btn = document.getElementById("loop-button-throttled");
 
     // Wait for the popup to be shown if it's not already, then we can get the iframe and
     // wait for the iframe's load to be completed.
     if (loopPanel.state == "closing" || loopPanel.state == "closed") {
       loopPanel.addEventListener("popupshown", () => {
         loopPanel.removeEventListener("popupshown", onpopupshown, true);
         onpopupshown();
       }, true);