[DevTools] Move extension embedder message to InspectorFrontentAPI.

Source/devtools/front_end/extensions/ExtensionServer.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 64 matching lines @@
     this._registerHandler(commands.SetSidebarPage, this._onSetSidebarPage.bind(this));
     this._registerHandler(commands.ShowPanel, this._onShowPanel.bind(this));
     this._registerHandler(commands.StopAuditCategoryRun, this._onStopAuditCategoryRun.bind(this));
     this._registerHandler(commands.Subscribe, this._onSubscribe.bind(this));
     this._registerHandler(commands.OpenResource, this._onOpenResource.bind(this));
     this._registerHandler(commands.Unsubscribe, this._onUnsubscribe.bind(this));
     this._registerHandler(commands.UpdateButton, this._onUpdateButton.bind(this));
     this._registerHandler(commands.UpdateAuditProgress, this._onUpdateAuditProgress.bind(this));
     window.addEventListener("message", this._onWindowMessage.bind(this), false);  // Only for main window.
 
+    InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.AddExtensions, this._addExtensions, this);
+    InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.SetInspectedTabId, this._setInspectedTabId, this);
+
     this._initExtensions();
 }
 
 WebInspector.ExtensionServer.Events = {
     SidebarPaneAdded: "SidebarPaneAdded",
     AuditCategoryAdded: "AuditCategoryAdded"
 }
 
 WebInspector.ExtensionServer.prototype = {
     initializeExtensions: function()
     {
         this._initializeCommandIssued = true;
         if (this._pendingExtensionInfos) {
-            this._addExtensions(this._pendingExtensionInfos);
+            this._pendingExtensionInfos.forEach(this._addExtension, this);
             delete this._pendingExtensionInfos;
         }
     },
 
     /**
      * @return {boolean}
      */
     hasExtensions: function()
     {
         return !!Object.keys(this._registeredExtensions).length;
@@ skipping 681 matching lines @@
         var request = /** @type {!WebInspector.NetworkRequest} */ (event.data);
         this._postNotification(WebInspector.extensionAPI.Events.NetworkRequestFinished, this._requestId(request), (new WebInspector.HAREntry(request)).build());
     },
 
     _notifyElementsSelectionChanged: function()
     {
         this._postNotification(WebInspector.extensionAPI.Events.PanelObjectSelected + "elements");
     },
 
     /**
-     * @param {!Array.<!ExtensionDescriptor>} extensionInfos
+     * @param {!WebInspector.Event} event
      */
-    _addExtensions: function(extensionInfos)
+    _addExtensions: function(event)
     {
+        if (WebInspector.extensionServer._overridePlatformExtensionAPIForTest)
+            window.buildPlatformExtensionAPI = WebInspector.extensionServer._overridePlatformExtensionAPIForTest;
+
+        var extensionInfos = /** @type {!Array.<!ExtensionDescriptor>} */ (event.data);
         if (this._initializeCommandIssued)
             extensionInfos.forEach(this._addExtension, this);
         else
             this._pendingExtensionInfos = extensionInfos;
     },
 
     /**
+     * @param {!WebInspector.Event} event
+     */
+    _setInspectedTabId: function(event)
+    {
+        this._inspectedTabId = /** @type {string} */ (event.data);
+    },
+
+    /**
      * @param {!ExtensionDescriptor} extensionInfo
      * @suppressGlobalPropertiesCheck
      */
     _addExtension: function(extensionInfo)
     {
         const urlOriginRegExp = new RegExp("([^:]+:\/\/[^/]*)\/"); // Can't use regexp literal here, MinJS chokes on it.
         var startPage = extensionInfo.startPage;
         var name = extensionInfo.name;
 
         try {
             var originMatch = urlOriginRegExp.exec(startPage);
             if (!originMatch) {
                 console.error("Skipping extension with invalid URL: " + startPage);
                 return false;
             }
             var extensionOrigin = originMatch[1];
             if (!this._registeredExtensions[extensionOrigin]) {
                 // See ExtensionAPI.js for details.
-                InspectorFrontendHost.setInjectedScriptForOrigin(extensionOrigin, buildExtensionAPIInjectedScript(extensionInfo));
+                InspectorFrontendHost.setInjectedScriptForOrigin(extensionOrigin, buildExtensionAPIInjectedScript(extensionInfo, this._inspectedTabId));
                 this._registeredExtensions[extensionOrigin] = { name: name };
             }
             var iframe = createElement("iframe");
             iframe.src = startPage;
             iframe.style.display = "none";
             document.body.appendChild(iframe);  // Only for main window.
         } catch (e) {
             console.error("Failed to initialize extension " + startPage + ":" + e);
             return false;
         }
@@ skipping 269 matching lines @@
     this.E_FAILED = makeStatus.bind(null, "E_FAILED", "Operation failed: %s");
 }
 
 /**
  * @typedef {{code: string, description: string, details: !Array.<*>}}
  */
 WebInspector.ExtensionStatus.Record;
 
 WebInspector.extensionAPI = {};
 defineCommonExtensionSymbols(WebInspector.extensionAPI);
-
-WebInspector.addExtensions = function(extensions)
-{
-    if (WebInspector.extensionServer._overridePlatformExtensionAPIForTest)
-        window.buildPlatformExtensionAPI = WebInspector.extensionServer._overridePlatformExtensionAPIForTest;
-    WebInspector.extensionServer._addExtensions(extensions);
-}
-
-WebInspector.setInspectedTabId = function(tabId)
-{
-    WebInspector._inspectedTabId = tabId;
-}