[DevTools] Do not expose agents on Target

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

Index: third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
index beaefd455791c983a89cefcdf300ecf5f9fdc757..4cd11df79cd8c9f9ca6c3ef63629e6c34802ee19 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
@@ -34,12 +34,13 @@
 SDK.NetworkManager = class extends SDK.SDKModel {
   /**
    * @param {!SDK.Target} target
+   * @param {!Protocol.Dispatcher} dispatcher
    */
-  constructor(target) {
-    super(target);
+  constructor(target, dispatcher) {
+    super(target, dispatcher);
     this._dispatcher = new SDK.NetworkDispatcher(this);
-    this._networkAgent = target.networkAgent();
-    target.registerNetworkDispatcher(this._dispatcher);
+    this._networkAgent = dispatcher.networkAgent();
+    dispatcher.registerNetworkDispatcher(this._dispatcher);
     if (Common.moduleSetting('cacheDisabled').get())
       this._networkAgent.setCacheDisabled(true);
 
@@ -457,7 +458,8 @@ SDK.NetworkDispatcher = class {
    * @param {!Protocol.Network.Initiator=} initiator
    */
   webSocketCreated(requestId, requestURL, initiator) {
-    var networkRequest = new SDK.NetworkRequest(this._manager, requestId, requestURL, '', '', '', initiator || null);
+    var networkRequest = new SDK.NetworkRequest(
+        this._manager, this._manager._networkAgent, requestId, requestURL, '', '', '', initiator || null);
     networkRequest.setResourceType(Common.resourceTypes.WebSocket);
     this._startNetworkRequest(networkRequest);
   }
@@ -656,20 +658,19 @@ SDK.NetworkDispatcher = class {
    * @param {?Protocol.Network.Initiator} initiator
    */
   _createNetworkRequest(requestId, frameId, loaderId, url, documentURL, initiator) {
-    return new SDK.NetworkRequest(this._manager, requestId, url, documentURL, frameId, loaderId, initiator);
+    return new SDK.NetworkRequest(
+        this._manager, this._manager._networkAgent, requestId, url, documentURL, frameId, loaderId, initiator);
   }
 };
 
 /**
- * @implements {SDK.TargetManager.Observer}
+ * @implements {SDK.SDKModelObserver<!SDK.NetworkManager>}
  * @unrestricted
  */
 SDK.MultitargetNetworkManager = class extends Common.Object {
   constructor() {
     super();
     this._userAgentOverride = '';
-    /** @type {!Set<!Protocol.NetworkAgent>} */
-    this._agents = new Set();
     /** @type {!SDK.NetworkManager.Conditions} */
     this._networkConditions = SDK.NetworkManager.NoThrottlingConditions;
 
@@ -678,7 +679,7 @@ SDK.MultitargetNetworkManager = class extends Common.Object {
     this._effectiveBlockedURLs = [];
     this._updateBlockedPatterns();
 
-    SDK.targetManager.observeTargets(this, SDK.Target.Capability.Network);
+    SDK.targetManager.observeModels(SDK.NetworkManager, this);
   }
 
   /**
@@ -696,27 +697,25 @@ SDK.MultitargetNetworkManager = class extends Common.Object {
 
   /**
    * @override
-   * @param {!SDK.Target} target
+   * @param {!SDK.NetworkManager} networkManager
    */
-  targetAdded(target) {
-    var networkAgent = target.networkAgent();
+  modelAdded(networkManager) {
+    var networkAgent = networkManager._networkAgent;
     if (this._extraHeaders)
       networkAgent.setExtraHTTPHeaders(this._extraHeaders);
     if (this._currentUserAgent())
       networkAgent.setUserAgentOverride(this._currentUserAgent());
     if (this._effectiveBlockedURLs.length)
       networkAgent.setBlockedURLs(this._effectiveBlockedURLs);
-    this._agents.add(networkAgent);
     if (this.isThrottling())
-      this._updateNetworkConditions(networkAgent);
+      this._updateNetworkConditions(networkManager);
   }
 
   /**
    * @override
-   * @param {!SDK.Target} target
+   * @param {!SDK.NetworkManager} networkManager
    */
-  targetRemoved(target) {
-    this._agents.delete(target.networkAgent());
+  modelRemoved(networkManager) {
   }
 
   /**
@@ -739,8 +738,8 @@ SDK.MultitargetNetworkManager = class extends Common.Object {
    */
   setNetworkConditions(conditions) {
     this._networkConditions = conditions;
-    for (var agent of this._agents)
-      this._updateNetworkConditions(agent);
+    for (var networkManager of SDK.targetManager.models(SDK.NetworkManager))
+      this._updateNetworkConditions(networkManager);
     this.dispatchEventToListeners(SDK.MultitargetNetworkManager.Events.ConditionsChanged);
   }
 
@@ -752,14 +751,14 @@ SDK.MultitargetNetworkManager = class extends Common.Object {
   }
 
   /**
-   * @param {!Protocol.NetworkAgent} networkAgent
+   * @param {!SDK.NetworkManager} networkManager
    */
-  _updateNetworkConditions(networkAgent) {
+  _updateNetworkConditions(networkManager) {
     var conditions = this._networkConditions;
     if (!this.isThrottling()) {
-      networkAgent.emulateNetworkConditions(false, 0, 0, 0);
+      networkManager._networkAgent.emulateNetworkConditions(false, 0, 0, 0);
     } else {
-      networkAgent.emulateNetworkConditions(
+      networkManager._networkAgent.emulateNetworkConditions(
           this.isOffline(), conditions.latency, conditions.download < 0 ? 0 : conditions.download,
           conditions.upload < 0 ? 0 : conditions.upload, SDK.NetworkManager._connectionType(conditions));
     }
@@ -770,8 +769,8 @@ SDK.MultitargetNetworkManager = class extends Common.Object {
    */
   setExtraHTTPHeaders(headers) {
     this._extraHeaders = headers;
-    for (var agent of this._agents)
-      agent.setExtraHTTPHeaders(this._extraHeaders);
+    for (var networkManager of SDK.targetManager.models(SDK.NetworkManager))
+      networkManager._networkAgent.setExtraHTTPHeaders(this._extraHeaders);
   }
 
   /**
@@ -784,8 +783,8 @@ SDK.MultitargetNetworkManager = class extends Common.Object {
   _updateUserAgentOverride() {
     var userAgent = this._currentUserAgent();
     Host.ResourceLoader.targetUserAgent = userAgent;
-    for (var agent of this._agents)
-      agent.setUserAgentOverride(userAgent);
+    for (var networkManager of SDK.targetManager.models(SDK.NetworkManager))
+      networkManager._networkAgent.setUserAgentOverride(userAgent);
   }
 
   /**
@@ -868,18 +867,18 @@ SDK.MultitargetNetworkManager = class extends Common.Object {
     if (!urls.length && !this._effectiveBlockedURLs.length)
       return;
     this._effectiveBlockedURLs = urls;
-    for (var agent of this._agents)
-      agent.setBlockedURLs(this._effectiveBlockedURLs);
+    for (var networkManager of SDK.targetManager.models(SDK.NetworkManager))
+      networkManager._networkAgent.setBlockedURLs(this._effectiveBlockedURLs);
   }
 
   clearBrowserCache() {
-    for (var agent of this._agents)
-      agent.clearBrowserCache();
+    for (var networkManager of SDK.targetManager.models(SDK.NetworkManager))
+      networkManager._networkAgent.clearBrowserCache();
   }
 
   clearBrowserCookies() {
-    for (var agent of this._agents)
-      agent.clearBrowserCookies();
+    for (var networkManager of SDK.targetManager.models(SDK.NetworkManager))
+      networkManager._networkAgent.clearBrowserCookies();
   }
 
   /**
@@ -887,16 +886,11 @@ SDK.MultitargetNetworkManager = class extends Common.Object {
    * @param {function(!Array<string>)} callback
    */
   getCertificate(origin, callback) {
-    var target = SDK.targetManager.mainTarget();
-    target.networkAgent().getCertificate(origin, mycallback);
-
-    /**
-     * @param {?Protocol.Error} error
-     * @param {!Array<string>} certificate
-     */
-    function mycallback(error, certificate) {
-      callback(error ? [] : certificate);
-    }
+    var networkManager = SDK.targetManager.models(SDK.NetworkManager)[0];
+    if (networkManager)
+      networkManager._networkAgent.getCertificate(origin, (error, certificate) => callback(error ? [] : certificate));
+    else
+      callback([]);
   }
 
   /**