[DevTools] Do not expose agents on Target

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

 /*
  * Copyright (C) 2012 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 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /**
  * @implements {Common.ContentProvider}
  * @unrestricted
  */
 SDK.NetworkRequest = class extends Common.Object {
   /**
    * @param {!SDK.NetworkManager} networkManager
+   * @param {!Protocol.NetworkAgent} networkAgent

[caseq, 2017/04/29 02:12:53]

Do we really need both manager and agent here? It feels confusing.

    * @param {!Protocol.Network.RequestId} requestId
    * @param {string} url
    * @param {string} documentURL
    * @param {!Protocol.Page.FrameId} frameId
    * @param {!Protocol.Network.LoaderId} loaderId
    * @param {?Protocol.Network.Initiator} initiator
    */
-  constructor(networkManager, requestId, url, documentURL, frameId, loaderId, initiator) {
+  constructor(networkManager, networkAgent, requestId, url, documentURL, frameId, loaderId, initiator) {
     super();
 
     this._networkManager = networkManager;
+    this._networkAgent = networkAgent;
     this._requestId = requestId;
     this.setUrl(url);
     this._documentURL = documentURL;
     this._frameId = frameId;
     this._loaderId = loaderId;
     /** @type {?Protocol.Network.Initiator} */
     this._initiator = initiator;
     this._issueTime = -1;
     this._startTime = -1;
     this._endTime = -1;
@@ skipping 969 matching lines @@
     function onResourceContent(error, content, contentEncoded) {
       this._content = error ? null : content;
       this._contentError = error;
       this._contentEncoded = contentEncoded;
       var callbacks = this._pendingContentCallbacks.slice();
       for (var i = 0; i < callbacks.length; ++i)
         callbacks[i](this._content);
       this._pendingContentCallbacks.length = 0;
       delete this._contentRequested;
     }
-    this._networkManager.target().networkAgent().getResponseBody(this._requestId, onResourceContent.bind(this));
+    this._networkAgent.getResponseBody(this._requestId, onResourceContent.bind(this));
   }
 
   /**
    * @return {?Protocol.Network.Initiator}
    */
   initiator() {
     return this._initiator;
   }
 
   /**
@@ skipping 54 matching lines @@
    * @param {string} eventId
    * @param {string} data
    */
   addEventSourceMessage(time, eventName, eventId, data) {
     var message = {time: this.pseudoWallTime(time), eventName: eventName, eventId: eventId, data: data};
     this._eventSourceMessages.push(message);
     this.dispatchEventToListeners(SDK.NetworkRequest.Events.EventSourceMessageAdded, message);
   }
 
   replayXHR() {
-    this._networkManager.target().networkAgent().replayXHR(this._requestId);
+    this._networkAgent.replayXHR(this._requestId);
   }
 
   /**
    * @return {!SDK.NetworkManager}
    */
   networkManager() {
     return this._networkManager;
   }
 };
 
@@ skipping 25 matching lines @@
   Send: 'send',
   Receive: 'receive',
   Error: 'error'
 };
 
 /** @typedef {!{type: SDK.NetworkRequest.WebSocketFrameType, time: number, text: string, opCode: number, mask: boolean}} */
 SDK.NetworkRequest.WebSocketFrame;
 
 /** @typedef {!{time: number, eventName: string, eventId: string, data: string}} */
 SDK.NetworkRequest.EventSourceMessage;