[DevTools] Move main target/connection to TargetManager.

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

 // Copyright (c) 2015 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
  * @implements {InspectorBackendClass.Connection}
  * @param {!InspectorBackendClass.Connection.Params} params
  */
 WebInspector.MainConnection = function(params)
@@ skipping 93 matching lines @@
             fulfill();
         });
         return promise;
     },
 };
 
 /**
  * @constructor
  * @implements {InspectorBackendClass.Connection}
  * @param {string} url
+ * @param {function()} onWebSocketDisconnect
  * @param {!InspectorBackendClass.Connection.Params} params
  */
-WebInspector.WebSocketConnection = function(url, params)
+WebInspector.WebSocketConnection = function(url, onWebSocketDisconnect, params)
 {
     this._socket = new WebSocket(url);
     this._socket.onerror = this._onError.bind(this);
     this._socket.onopen = this._onOpen.bind(this);
     this._socket.onmessage = (messageEvent) => params.onMessage.call(null, /** @type {string} */ (messageEvent.data));
+    this._socket.onclose = this._onClose.bind(this);
+
     this._onDisconnect = params.onDisconnect;
-    this._socket.onclose = params.onDisconnect.bind(null, "websocket closed");
-
+    this._onWebSocketDisconnect = onWebSocketDisconnect;
     this._connected = false;
     this._messages = [];
 };
 
 WebInspector.WebSocketConnection.prototype = {
     _onError: function()
     {
+        this._onWebSocketDisconnect.call(null);
         // This is called if error occurred while connecting.
         this._onDisconnect.call(null, "connection failed");
         this._close();
     },
 
     _onOpen: function()
     {
         this._socket.onerror = console.error;
         this._connected = true;
         for (var message of this._messages)
             this._socket.send(message);
         this._messages = [];
     },
 
-    _close: function()
+    _onClose: function()
+    {
+        this._onWebSocketDisconnect.call(null);
+        this._onDisconnect.call(null, "websocket closed");
+        this._close();
+    },
+
+    /**
+     * @param {function()=} callback
+     */
+    _close: function(callback)
     {
         this._socket.onerror = null;
         this._socket.onopen = null;
-        this._socket.onclose = null;
+        this._socket.onclose = callback || null;
         this._socket.onmessage = null;
         this._socket.close();
         this._socket = null;
+        this._onWebSocketDisconnect = null;
     },
 
     /**
      * @override
      * @param {string} message
      */
     sendMessage: function(message)
     {
         if (this._connected)
             this._socket.send(message);
         else
             this._messages.push(message);
     },
 
     /**
      * @override
      * @return {!Promise}
      */
     disconnect: function()
     {
-        this._onDisconnect.call(null, "force disconnect");
-        this._close();
-        return Promise.resolve();
+        var fulfill;
+        var promise = new Promise(f => fulfill = f);
+        this._close(() => {
+            this._onDisconnect.call(null, "force disconnect");
+            fulfill();
+        });
+        return promise;
     }
 };
 
 /**
  * @constructor
  * @implements {InspectorBackendClass.Connection}
  * @param {!InspectorBackendClass.Connection.Params} params
  */
 WebInspector.StubConnection = function(params)
 {
@@ skipping 26 matching lines @@
      * @return {!Promise}
      */
     disconnect: function()
     {
         this._onDisconnect.call(null, "force disconnect");
         this._onDisconnect = null;
         this._onMessage = null;
         return Promise.resolve();
     },
 };