[Devtools] Removed NetworkRequest dependency on NetworkManager

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

Index: third_party/WebKit/Source/devtools/front_end/sdk/NetworkRequest.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkRequest.js b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkRequest.js
index c9158782be687c347419efaa2d190c0047e074c8..4cc22fa082fb158f7591fb58d1185d28542aa80f 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkRequest.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkRequest.js
@@ -33,7 +33,6 @@
  */
 SDK.NetworkRequest = class extends Common.Object {
   /**
-   * @param {!SDK.NetworkManager} networkManager
    * @param {!Protocol.Network.RequestId} requestId
    * @param {string} url
    * @param {string} documentURL
@@ -41,10 +40,9 @@ SDK.NetworkRequest = class extends Common.Object {
    * @param {!Protocol.Network.LoaderId} loaderId
    * @param {?Protocol.Network.Initiator} initiator
    */
-  constructor(networkManager, requestId, url, documentURL, frameId, loaderId, initiator) {
+  constructor(requestId, url, documentURL, frameId, loaderId, initiator) {
     super();
 
-    this._networkManager = networkManager;
     this._requestId = requestId;
     this.setUrl(url);
     this._documentURL = documentURL;
@@ -533,7 +531,8 @@ SDK.NetworkRequest = class extends Common.Object {
     } else {
       this._path = this._parsedURL.host + this._parsedURL.folderPathComponents;
 
-      var inspectedURL = this._networkManager.target().inspectedURL().asParsedURL();
+      var networkManager = SDK.NetworkManager.managerForRequest(this);
+      var inspectedURL = networkManager ? networkManager.target().inspectedURL().asParsedURL() : null;
       this._path = this._path.trimURL(inspectedURL ? inspectedURL.host : '');
       if (this._parsedURL.lastPathComponent || this._parsedURL.queryParams) {
         this._name =
@@ -1016,7 +1015,12 @@ SDK.NetworkRequest = class extends Common.Object {
   _innerRequestContent() {
     if (this._contentRequested)
       return;
+    var networkManager = SDK.NetworkManager.managerForRequest(this);
+    if (!networkManager)
+      return;
     this._contentRequested = true;
+    // TODO(allada) This should be moved into NetworkManager.

[dgozman, 2017/06/06 20:54:41]

This should actually be abstracted away to work with HAR.

[allada, 2017/06/08 00:42:06]

Well HAR import will set the content of the request while it's
generating them, and then it'll try to look it up from networkmanager
assuming it exists for the request.

+    networkManager.target().networkAgent().getResponseBody(this._requestId, onResourceContent.bind(this));
 
     /**
      * @param {?Protocol.Error} error
@@ -1034,7 +1038,6 @@ SDK.NetworkRequest = class extends Common.Object {
       this._pendingContentCallbacks.length = 0;
       delete this._contentRequested;
     }
-    this._networkManager.target().networkAgent().getResponseBody(this._requestId, onResourceContent.bind(this));
   }
 
   /**
@@ -1107,13 +1110,6 @@ SDK.NetworkRequest = class extends Common.Object {
     this._eventSourceMessages.push(message);
     this.dispatchEventToListeners(SDK.NetworkRequest.Events.EventSourceMessageAdded, message);
   }
-
-  /**
-   * @return {!SDK.NetworkManager}
-   */
-  networkManager() {
-    return this._networkManager;
-  }
 };
 
 /** @enum {symbol} */