Bug 1111260 - Fix references to nsITimer.TYPE_ONE_SHOT. r=dburns
authorAndreas Tolfsen <ato@mozilla.com>
Sat, 13 Dec 2014 20:15:46 +0000
changeset 220199 13d74279980e41a51ffa0a4d25e0b55e0a4dcc46
parent 220198 97565b594f027c93656e97a7d0b5b23dd42a6247
child 220200 25af7d428a320ec8287ab56e78ac0ec7c634e221
push id10457
push userryanvm@gmail.com
push dateThu, 18 Dec 2014 01:54:25 +0000
treeherderfx-team@0e441ff66c5e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdburns
bugs1111260
milestone37.0a1
Bug 1111260 - Fix references to nsITimer.TYPE_ONE_SHOT. r=dburns
testing/marionette/marionette-server.js
--- a/testing/marionette/marionette-server.js
+++ b/testing/marionette/marionette-server.js
@@ -884,17 +884,17 @@ MarionetteServerConnection.prototype = {
       that.sendToClient({from: that.actorID, error: error_msg},
                         marionette.command_id);
      };
      let setTimer = function() {
       that.inactivityTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
       if (that.inactivityTimer != null) {
        that.inactivityTimer.initWithCallback(function() {
         inactivityTimeoutHandler("timed out due to inactivity", 28);
-       }, inactivityTimeout, Ci.nsITimer.TYPE_ONESHOT);
+       }, inactivityTimeout, Ci.nsITimer.TYPE_ONE_SHOT);
       }
      }
      setTimer();
      this.heartbeatCallback = function resetInactivityTimer() {
       that.inactivityTimer.cancel();
       setTimer();
      }
     }
@@ -1047,25 +1047,25 @@ MarionetteServerConnection.prototype = {
 
     // handle the inactivity timeout
     let that = this;
     if (inactivityTimeout) {
      this.inactivityTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
      if (this.inactivityTimer != null) {
       this.inactivityTimer.initWithCallback(function() {
        chromeAsyncReturnFunc("timed out due to inactivity", 28);
-      }, inactivityTimeout, Ci.nsITimer.TYPE_ONESHOT);
+      }, inactivityTimeout, Ci.nsITimer.TYPE_ONE_SHOT);
      }
      this.heartbeatCallback = function resetInactivityTimer() {
       that.inactivityTimer.cancel();
       that.inactivityTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
       if (that.inactivityTimer != null) {
        that.inactivityTimer.initWithCallback(function() {
         chromeAsyncReturnFunc("timed out due to inactivity", 28);
-       }, inactivityTimeout, Ci.nsITimer.TYPE_ONESHOT);
+       }, inactivityTimeout, Ci.nsITimer.TYPE_ONE_SHOT);
       }
      }
     }
 
     let curWindow = this.getCurrentWindow();
     let original_onerror = curWindow.onerror;
     that.timeout = timeout;
     let marionette = new Marionette(this, curWindow, "chrome",
@@ -1123,17 +1123,17 @@ MarionetteServerConnection.prototype = {
       return;
 
     try {
 
       this.timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
       if (this.timer != null) {
         this.timer.initWithCallback(function() {
           chromeAsyncReturnFunc("timed out", 28);
-        }, that.timeout, Ci.nsITimer.TYPE_ONESHOT);
+        }, that.timeout, Ci.nsITimer.TYPE_ONE_SHOT);
       }
 
       _chromeSandbox.returnFunc = chromeAsyncReturnFunc;
       _chromeSandbox.finish = chromeAsyncFinish;
 
       if (directInject) {
         script = aRequest.parameters.script;
       }