[DevTools] Do not expose agents on Target

third_party/WebKit/Source/devtools/front_end/resources/ServiceWorkersView.js

 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 /**
  * @implements {SDK.SDKModelObserver<!SDK.ServiceWorkerManager>}
  * @unrestricted
  */
 Resources.ServiceWorkersView = class extends UI.VBox {
   constructor() {
     super(true);
@@ skipping 269 matching lines @@
 
       var clientsList = this._wrapWidget(this._section.appendField(Common.UIString('Clients')));
       clientsList.removeChildren();
       this._section.setFieldVisible(Common.UIString('Clients'), active.controlledClients.length);
       for (var client of active.controlledClients) {
         var clientLabelText = clientsList.createChild('div', 'service-worker-client');
         if (this._clientInfoCache.has(client)) {
           this._updateClientInfo(
               clientLabelText, /** @type {!Protocol.Target.TargetInfo} */ (this._clientInfoCache.get(client)));
         }
-        this._manager.target().targetAgent().getTargetInfo(client, this._onClientInfo.bind(this, clientLabelText));
+        this._manager.controlledClientInfo(client).then(this._onClientInfo.bind(this, clientLabelText));
       }
     }
 
     if (waiting) {
       var waitingEntry = versionsStack.createChild('div', 'service-worker-version');
       waitingEntry.createChild('div', 'service-worker-waiting-circle');
       waitingEntry.createChild('span').textContent = Common.UIString('#%s waiting to activate', waiting.id);
       createLink(waitingEntry, Common.UIString('skipWaiting'), this._skipButtonClicked.bind(this));
       waitingEntry.createChild('div', 'service-worker-subtitle').textContent =
           Common.UIString('Received %s', new Date(waiting.scriptResponseTime * 1000).toLocaleString());
@@ skipping 74 matching lines @@
    * @param {!Common.Event} event
    */
   _syncButtonClicked(event) {
     var tag = 'test-tag-from-devtools';
     var lastChance = true;
     this._manager.dispatchSyncEvent(this._registration.id, tag, lastChance);
   }
 
   /**
    * @param {!Element} element
-   * @param {?Protocol.Error} error
    * @param {?Protocol.Target.TargetInfo} targetInfo
    */
-  _onClientInfo(element, error, targetInfo) {
-    if (error || !targetInfo)
+  _onClientInfo(element, targetInfo) {
+    if (!targetInfo)
       return;
     this._clientInfoCache.set(targetInfo.targetId, targetInfo);
     this._updateClientInfo(element, targetInfo);
   }
 
   /**
    * @param {!Element} element
    * @param {!Protocol.Target.TargetInfo} targetInfo
    */
   _updateClientInfo(element, targetInfo) {
     if (targetInfo.type !== 'page' && targetInfo.type === 'iframe') {
       element.createTextChild(Common.UIString('Worker: %s', targetInfo.url));
       return;
     }
     element.removeChildren();
     element.createTextChild(targetInfo.url);
     var focusLabel = element.createChild('label', 'link');
     focusLabel.createTextChild('focus');
-    focusLabel.addEventListener('click', this._activateTarget.bind(this, targetInfo.targetId), true);
-  }
-
-  /**
-   * @param {string} targetId
-   */
-  _activateTarget(targetId) {
-    this._manager.target().targetAgent().activateTarget(targetId);
+    focusLabel.addEventListener('click', () => this._manager.activateControlledClient(targetInfo.targetId), true);
   }
 
   _startButtonClicked() {
     this._manager.startWorker(this._registration.scopeURL);
   }
 
   _skipButtonClicked() {
     this._manager.skipWaiting(this._registration.scopeURL);
   }
 
@@ skipping 30 matching lines @@
    * @return {!Element}
    */
   _wrapWidget(container) {
     var shadowRoot = UI.createShadowRootWithCoreStyles(container);
     UI.appendStyle(shadowRoot, 'resources/serviceWorkersView.css');
     var contentElement = createElement('div');
     shadowRoot.appendChild(contentElement);
     return contentElement;
   }
 };