[DevTools] Do not expose agents on Target

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

Index: third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js b/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js
index 95e20682336f8f7ed6e94b3884def3a53260c3ce..310a443a8f6dedf8e5dff24a24a594d63f64c878 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js
@@ -34,9 +34,10 @@
 SDK.ResourceTreeModel = class extends SDK.SDKModel {
   /**
    * @param {!SDK.Target} target
+   * @param {!Protocol.Dispatcher} dispatcher
    */
-  constructor(target) {
-    super(target);
+  constructor(target, dispatcher) {
+    super(target, dispatcher);
 
     var networkManager = target.model(SDK.NetworkManager);
     if (networkManager) {
@@ -45,17 +46,22 @@ SDK.ResourceTreeModel = class extends SDK.SDKModel {
           SDK.NetworkManager.Events.RequestUpdateDropped, this._onRequestUpdateDropped, this);
     }
 
-    this._agent = target.pageAgent();
+    this._agent = dispatcher.pageAgent();
     this._agent.enable();
     this._securityOriginManager = target.model(SDK.SecurityOriginManager);
 
     this._fetchResourceTree();
 
-    target.registerPageDispatcher(new SDK.PageDispatcher(this));
+    dispatcher.registerPageDispatcher(new SDK.PageDispatcher(this));
 
     this._pendingReloadOptions = null;
     this._reloadSuspensionCount = 0;
     this._isInterstitialShowing = false;
+
+    var autoAttachSetting = Common.settings.moduleSetting('autoAttachToCreatedPages');
+    autoAttachSetting.addChangeListener(() => this._agent.setAutoAttachToCreatedPages(autoAttachSetting.get()));
+    if (autoAttachSetting.get())
+      this._agent.setAutoAttachToCreatedPages(true);
   }
 
   /**
@@ -268,8 +274,8 @@ SDK.ResourceTreeModel = class extends SDK.SDKModel {
       return;
 
     var resource = new SDK.Resource(
-        this, null, url, frame.url, frameId, event.data.loaderId, Common.resourceTypes[event.data.resourceType],
-        event.data.mimeType, event.data.lastModified, null);
+        this, this._agent, null, url, frame.url, frameId, event.data.loaderId,
+        Common.resourceTypes[event.data.resourceType], event.data.mimeType, event.data.lastModified, null);
     frame.addResource(resource);
   }
 
@@ -344,7 +350,7 @@ SDK.ResourceTreeModel = class extends SDK.SDKModel {
   _createResourceFromFramePayload(frame, url, type, mimeType, lastModifiedTime, contentSize) {
     var lastModified = typeof lastModifiedTime === 'number' ? new Date(lastModifiedTime * 1000) : null;
     return new SDK.Resource(
-        this, null, url, frame.url, frame.id, frame.loaderId, type, mimeType, lastModified, contentSize);
+        this, this._agent, null, url, frame.url, frame.id, frame.loaderId, type, mimeType, lastModified, contentSize);
   }
 
   suspendReload() {
@@ -478,6 +484,10 @@ SDK.ResourceTreeModel = class extends SDK.SDKModel {
     this._securityOriginManager.updateSecurityOrigins(securityOrigins);
     this._securityOriginManager.setMainSecurityOrigin(mainSecurityOrigin || '');
   }
+
+  requestAppBanner() {
+    this._agent.requestAppBanner();
+  }
 };
 
 SDK.SDKModel.register(SDK.ResourceTreeModel, SDK.Target.Capability.DOM, true);
@@ -681,7 +691,7 @@ SDK.ResourceTreeFrame = class {
       return;
     }
     resource = new SDK.Resource(
-        this._model, request, request.url(), request.documentURL, request.frameId, request.loaderId,
+        this._model, this._model._agent, request, request.url(), request.documentURL, request.frameId, request.loaderId,
         request.resourceType(), request.mimeType, null, null);
     this._resourcesMap[resource.url] = resource;
     this._model.dispatchEventToListeners(SDK.ResourceTreeModel.Events.ResourceAdded, resource);