[DevTools] Refactor connection-related classes.

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.
  */
 
 /**
  * @constructor
  * @extends {WebInspector.Object}
  */
@@ skipping 165 matching lines @@
      */
     unobserveTargets: function(targetObserver)
     {
         delete targetObserver[this._observerCapabiliesMaskSymbol];
         this._observers.remove(targetObserver);
     },
 
     /**
      * @param {string} name
      * @param {number} capabilitiesMask
-     * @param {!InspectorBackendClass.Connection} connection
+     * @param {!InspectorBackendClass.Connection.Factory} connectionFactory
      * @param {?WebInspector.Target} parentTarget
      * @return {!WebInspector.Target}
      */
-    createTarget: function(name, capabilitiesMask, connection, parentTarget)
+    createTarget: function(name, capabilitiesMask, connectionFactory, parentTarget)
     {
-        var target = new WebInspector.Target(this, name, capabilitiesMask, connection, parentTarget);
+        var target = new WebInspector.Target(this, name, capabilitiesMask, connectionFactory, parentTarget);
 
         var logAgent = target.hasLogCapability() ? target.logAgent() : null;
 
         /** @type {!WebInspector.ConsoleModel} */
         target.consoleModel = new WebInspector.ConsoleModel(target, logAgent);
 
         var networkManager = null;
         var resourceTreeModel = null;
         if (target.hasNetworkCapability())
             networkManager = new WebInspector.NetworkManager(target);
@@ skipping 26 matching lines @@
         if (target.hasBrowserCapability()) {
             target.subTargetsManager = new WebInspector.SubTargetsManager(target);
             target.serviceWorkerManager = new WebInspector.ServiceWorkerManager(target, target.subTargetsManager);
         }
 
         this.addTarget(target);
         return target;
     },
 
     /**
-     * @param {function()} factory
+     * @param {function(function(string)):!Promise<!InspectorBackendClass.Connection>} interceptor
      */
-    setMainTargetFactory: function(factory)
+    setMainConnectionInterceptor: function(interceptor)
     {
-        this._mainTargetFactory = factory;
+        this._mainConnectionInterceptor = interceptor;
     },
 
     /**
-     * @param {function(string)} dispatch
-     * @return {!Promise<!WebInspector.RawProtocolConnection>}
+     * @param {function(string)} onMessage
+     * @return {!Promise<!InspectorBackendClass.Connection>}
      */
-    interceptMainConnection: function(dispatch)
+    interceptMainConnection: function(onMessage)
     {
-        var target = WebInspector.targetManager.mainTarget();
-        if (target)
-            target.connection().close();
-
-        var fulfill;
-        var result = new Promise(resolve => fulfill = resolve);
-        InspectorFrontendHost.reattach(() => fulfill(new WebInspector.RawProtocolConnection(dispatch, yieldCallback.bind(this))));
-        return result;
-
-        /**
-         * @this {WebInspector.TargetManager}
-         */
-        function yieldCallback()
-        {
-            InspectorFrontendHost.reattach(this._mainTargetFactory());
-        }
+        return this._mainConnectionInterceptor.call(null, onMessage);
     },
 
     /**
      * @param {!WebInspector.Target} target
      * @return {!Array<!WebInspector.TargetManager.Observer>}
      */
     _observersForTarget: function(target)
     {
         return this._observers.filter((observer) => target.hasAllCapabilities(observer[this._observerCapabiliesMaskSymbol] || 0));
     },
@@ skipping 138 matching lines @@
     /**
      * @param {!WebInspector.Target} target
      */
     targetRemoved: function(target) { },
 };
 
 /**
  * @type {!WebInspector.TargetManager}
  */
 WebInspector.targetManager = new WebInspector.TargetManager();