Bug 1481691 - Drop code and comments for older versions of Firefox. r=jdescottes
authorHiroyuki Ikezoe <hikezoe@mozilla.com>
Fri, 10 Aug 2018 16:32:21 +0900
changeset 486167 0d6fb76b026b0fe301683a5b2b96b82fe4fb7e46
parent 486166 59dae312f47b3d0fdba8ea29225299023ca4532f
child 486168 fa083919718a87778ac4a8507ffd41c103861ec8
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjdescottes
bugs1481691
milestone63.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 1481691 - Drop code and comments for older versions of Firefox. r=jdescottes
devtools/shared/adb/adb-socket.js
devtools/shared/adb/adb.js
--- a/devtools/shared/adb/adb-socket.js
+++ b/devtools/shared/adb/adb-socket.js
@@ -3,21 +3,19 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
 const { Cu } = require("chrome");
 const { dumpn } = require("devtools/shared/DevToolsUtils");
 
 function createTCPSocket(location, port, options) {
-  // Starting with FF57, jsm share the same global and requires some special code
   const { TCPSocket } =
     Cu.getGlobalForObject(Cu.import("resource://gre/modules/Services.jsm", {}));
 
-  // Starting with FF43, TCPSocket is now exposed via WebIDL
   return new TCPSocket(location, port, options);
 }
 
 // Creates a socket connected to the adb instance.
 // This instantiation is sync, and returns before we know if opening the
 // connection succeeds. Callers must attach handlers to the s field.
 class AdbSocket {
   constructor() {
--- a/devtools/shared/adb/adb.js
+++ b/devtools/shared/adb/adb.js
@@ -103,23 +103,18 @@ const ADB = {
 
       this.didRunInitially = true;
       const process = Cc["@mozilla.org/process/util;1"]
                       .createInstance(Ci.nsIProcess);
       // FIXME: Bug 1481691 - We should avoid extracting files every time.
       const adbFile = await this.adbFilePromise;
       process.init(adbFile);
       // Hide command prompt window on Windows
-      try {
-        // startHidden is 55+
-        process.startHidden = true;
-        // noShell attribute is 58+
-        process.noShell = true;
-      } catch (e) {
-      }
+      process.startHidden = true;
+      process.noShell = true;
       const params = ["start-server"];
       let isStarted = false;
       try {
         await this._runProcess(process, params);
         isStarted = await this._waitUntil(check);
       } catch (e) {
       }
 
@@ -166,23 +161,18 @@ const ADB = {
    *        the update doesn't race the killing.
    */
   async kill(sync) {
     const process = Cc["@mozilla.org/process/util;1"]
                     .createInstance(Ci.nsIProcess);
     const adbFile = await this.adbFilePromise;
     process.init(adbFile);
     // Hide command prompt window on Windows
-    try {
-      // startHidden is 55+
-      process.startHidden = true;
-      // noShell attribute is 58+
-      process.noShell = true;
-    } catch (e) {
-    }
+    process.startHidden = true;
+    process.noShell = true;
     const params = ["kill-server"];
 
     if (sync) {
       process.run(true, params, params.length);
       dumpn("adb kill-server: " + process.exitValue);
       this.ready = false;
       this.didRunInitially = false;
     } else {