[Devtools] Removed NetworkRequest dependency on NetworkManager

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

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 41 matching lines @@
     this._bypassServiceWorkerSetting = Common.settings.createSetting('bypassServiceWorker', false);
     if (this._bypassServiceWorkerSetting.get())
       this._bypassServiceWorkerChanged();
     this._bypassServiceWorkerSetting.addChangeListener(this._bypassServiceWorkerChanged, this);
 
     Common.moduleSetting('cacheDisabled').addChangeListener(this._cacheDisabledSettingChanged, this);
   }
 
   /**
    * @param {!SDK.NetworkRequest} request
+   * @return {?SDK.NetworkManager}
+   */
+  static forRequest(request) {
+    return request[SDK.NetworkManager._networkManagerForRequestSymbol];
+  }
+
+  /**
+   * @param {!SDK.NetworkRequest} request
    * @return {boolean}
    */
   static canReplayRequest(request) {
-    return request.resourceType() === Common.resourceTypes.XHR;
+    return !!request[SDK.NetworkManager._networkManagerForRequestSymbol] &&
+        request.resourceType() === Common.resourceTypes.XHR;
   }
 
   /**
    * @param {!SDK.NetworkRequest} request
    */
   static replayRequest(request) {
-    // TODO(allada) networkAgent() will be removed from NetworkRequest, but in the mean time we extract it from request.
-    request.networkManager()._networkAgent.replayXHR(request.requestId());
+    var manager = request[SDK.NetworkManager._networkManagerForRequestSymbol];
+    if (!manager)
+      return;
+    manager._networkAgent.replayXHR(request.requestId());
   }
 
   /**
    * @param {!SDK.NetworkRequest} request
    * @return {!Promise<!SDK.NetworkRequest.ContentData>}
    */
   static async requestContentData(request) {
     if (request.resourceType() === Common.resourceTypes.WebSocket)
       return {error: 'Content for WebSockets is currently not supported', content: null, encoded: false};
     if (!request.finished)
       await request.once(SDK.NetworkRequest.Events.FinishedLoading);
-    var manager = request.networkManager();
+    var manager = SDK.NetworkManager.forRequest(request);
+    if (!manager)
+      return {error: 'No network manager for request', content: null, encoded: false};
     var response = await manager._networkAgent.invoke_getResponseBody({requestId: request.requestId()});
     var error = response[Protocol.Error] || null;
     return {error: error, content: error ? null : response.body, encoded: response.base64Encoded};
   }
 
   /**
    * @param {!SDK.NetworkManager.Conditions} conditions
    * @return {!Protocol.Network.ConnectionType}
    * TODO(allada): this belongs to NetworkConditionsSelector, which should hardcode/guess it.
    */
@@ skipping 86 matching lines @@
 /** @type {!SDK.NetworkManager.Conditions} */
 SDK.NetworkManager.OfflineConditions = {
   title: Common.UIString('Offline'),
   download: 0,
   upload: 0,
   latency: 0
 };
 /** @typedef {{url: string, enabled: boolean}} */
 SDK.NetworkManager.BlockedPattern;
 
+SDK.NetworkManager._networkManagerForRequestSymbol = Symbol('NetworkManager');
 
 /**
  * @implements {Protocol.NetworkDispatcher}
  * @unrestricted
  */
 SDK.NetworkDispatcher = class {
+  /**
+   * @param {!SDK.NetworkManager} manager
+   */
   constructor(manager) {
     this._manager = manager;
     /** @type {!Object<!Protocol.Network.RequestId, !SDK.NetworkRequest>} */
     this._inflightRequestsById = {};
     /** @type {!Object<string, !SDK.NetworkRequest>} */
     this._inflightRequestsByURL = {};
   }
 
   /**
    * @param {!Protocol.Network.Headers} headersMap
@@ skipping 273 matching lines @@
     this._finishNetworkRequest(networkRequest, time, -1);
   }
 
   /**
    * @override
    * @param {!Protocol.Network.RequestId} requestId
    * @param {string} requestURL
    * @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(requestId, requestURL, '', '', '', initiator || null);
+    networkRequest[SDK.NetworkManager._networkManagerForRequestSymbol] = this._manager;
     networkRequest.setResourceType(Common.resourceTypes.WebSocket);
     this._startNetworkRequest(networkRequest);
   }
 
   /**
    * @override
    * @param {!Protocol.Network.RequestId} requestId
    * @param {!Protocol.Network.Timestamp} time
    * @param {!Protocol.Network.Timestamp} wallTime
    * @param {!Protocol.Network.WebSocketRequest} request
@@ skipping 191 matching lines @@
 
   /**
    * @param {!Protocol.Network.RequestId} requestId
    * @param {string} frameId
    * @param {!Protocol.Network.LoaderId} loaderId
    * @param {string} url
    * @param {string} documentURL
    * @param {?Protocol.Network.Initiator} initiator
    */
   _createNetworkRequest(requestId, frameId, loaderId, url, documentURL, initiator) {
-    return new SDK.NetworkRequest(this._manager, requestId, url, documentURL, frameId, loaderId, initiator);
+    var request = new SDK.NetworkRequest(requestId, url, documentURL, frameId, loaderId, initiator);
+    request[SDK.NetworkManager._networkManagerForRequestSymbol] = this._manager;
+    return request;
   }
 };
 
 /**
  * @implements {SDK.TargetManager.Observer}
  * @unrestricted
  */
 SDK.MultitargetNetworkManager = class extends Common.Object {
   constructor() {
     super();
@@ skipping 242 matching lines @@
 SDK.MultitargetNetworkManager.Events = {
   BlockedPatternsChanged: Symbol('BlockedPatternsChanged'),
   ConditionsChanged: Symbol('ConditionsChanged'),
   UserAgentChanged: Symbol('UserAgentChanged')
 };
 
 /**
  * @type {!SDK.MultitargetNetworkManager}
  */
 SDK.multitargetNetworkManager;