Revert of [DevTools] Show icon in top toolbar when Node target is available

third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js

 /*
  * Copyright 2014 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 SDK.TargetManager = class extends Common.Object {
   constructor() {
     super();
     /** @type {!Array.<!SDK.Target>} */
@@ skipping 310 matching lines @@
    * @param {function()} webSocketConnectionLostCallback
    */
   connectToMainTarget(webSocketConnectionLostCallback) {
     this._webSocketConnectionLostCallback = webSocketConnectionLostCallback;
     this._connectAndCreateMainTarget();
   }
 
   _connectAndCreateMainTarget() {
     if (Runtime.queryParam('nodeFrontend')) {
       var target = new SDK.Target(
-          this, 'main', Common.UIString('Node.js'), SDK.Target.Capability.Target, this._createMainConnection.bind(this),
+          this, 'main', Common.UIString('Node'), SDK.Target.Capability.Target, this._createMainConnection.bind(this),
           null);
-      target.setInspectedURL('Node.js');
+      target.setInspectedURL('Node');
       this._childTargetManagers.set(target, new SDK.ChildTargetManager(this, target));
       Host.userMetrics.actionTaken(Host.UserMetrics.Action.ConnectToNodeJSFromFrontend);
       return;
     }
 
     var capabilities = SDK.Target.Capability.Browser | SDK.Target.Capability.DOM | SDK.Target.Capability.JS |
         SDK.Target.Capability.Log | SDK.Target.Capability.Network | SDK.Target.Capability.Target |
         SDK.Target.Capability.ScreenCapture | SDK.Target.Capability.Tracing | SDK.Target.Capability.Emulation |
         SDK.Target.Capability.Security | SDK.Target.Capability.Input | SDK.Target.Capability.Inspector |
         SDK.Target.Capability.DeviceEmulation;
@@ skipping 59 matching lines @@
     this._targetAgent = parentTarget.targetAgent();
 
     /** @type {!Map<string, !SDK.ChildConnection>} */
     this._childConnections = new Map();
 
     parentTarget.registerTargetDispatcher(this);
     this._targetAgent.invoke_setAutoAttach({autoAttach: true, waitForDebuggerOnStart: true});
     if (Runtime.experiments.isEnabled('autoAttachToCrossProcessSubframes'))
       this._targetAgent.setAttachToFrames(true);
 
-    if (!parentTarget.parentTarget()) {
+    if (!parentTarget.parentTarget())
       this._targetAgent.setDiscoverTargets(true);
-      if (Runtime.queryParam('nodeFrontend')) {
-        InspectorFrontendHost.setDevicesUpdatesEnabled(true);
-        InspectorFrontendHost.events.addEventListener(
-            InspectorFrontendHostAPI.Events.DevicesDiscoveryConfigChanged, this._devicesDiscoveryConfigChanged, this);
-      } else {
-        this._targetAgent.setRemoteLocations([{host: 'localhost', port: 9229}]);
-      }
+
+    if (Runtime.queryParam('nodeFrontend') && !this._parentTarget.parentTarget()) {
+      InspectorFrontendHost.setDevicesUpdatesEnabled(true);
+      InspectorFrontendHost.events.addEventListener(
+          InspectorFrontendHostAPI.Events.DevicesDiscoveryConfigChanged, this._devicesDiscoveryConfigChanged, this);
     }
   }
 
   /**
    * @param {!Common.Event} event
    */
   _devicesDiscoveryConfigChanged(event) {
     var config = /** @type {!Adb.Config} */ (event.data);
     var locations = [];
     for (var address of config.networkDiscoveryConfig) {
       var parts = address.split(':');
       var port = parseInt(parts[1], 10);
-      if (parts[0] && port)
-        locations.push({host: parts[0], port: port});
+      locations.push({host: parts[0] || 'localhost', port: port || 9229});
     }
     this._targetAgent.setRemoteLocations(locations);
   }
 
   /**
    * @return {!Promise}
    */
   suspend() {
     return this._targetAgent.invoke_setAutoAttach({autoAttach: true, waitForDebuggerOnStart: false});
   }
@@ skipping 63 matching lines @@
   }
 
   /**
    * @override
    * @param {!Protocol.Target.TargetInfo} targetInfo
    * @param {boolean} waitingForDebugger
    */
   attachedToTarget(targetInfo, waitingForDebugger) {
     var targetName = '';
     if (targetInfo.type === 'node') {
-      targetName = Common.UIString('Node.js: %s', targetInfo.url);
+      targetName = Common.UIString('Node: %s', targetInfo.url);
     } else if (targetInfo.type !== 'iframe') {
       var parsedURL = targetInfo.url.asParsedURL();
       targetName =
           parsedURL ? parsedURL.lastPathComponentWithFragment() : '#' + (++this._targetManager._lastAnonymousTargetId);
     }
     var target = this._targetManager.createTarget(
         targetInfo.targetId, targetName, this._capabilitiesForType(targetInfo.type),
         this._createChildConnection.bind(this, this._targetAgent, targetInfo.targetId), this._parentTarget);
     target[SDK.TargetManager._isWorkerSymbol] = targetInfo.type === 'worker';
 
@@ skipping 117 matching lines @@
   /**
    * @param {!T} model
    */
   modelRemoved(model) {},
 };
 
 /**
  * @type {!SDK.TargetManager}
  */
 SDK.targetManager = new SDK.TargetManager();