DevTools: introduce multitarget model listeners

Source/devtools/front_end/extensions/ExtensionServer.js

Index: Source/devtools/front_end/extensions/ExtensionServer.js
diff --git a/Source/devtools/front_end/extensions/ExtensionServer.js b/Source/devtools/front_end/extensions/ExtensionServer.js
index 1932c7989b655d203bb5707eaf5118753b1d4df1..3e220421e8584f5ab5d8937b0ef5d0aa37f35adf 100644
--- a/Source/devtools/front_end/extensions/ExtensionServer.js
+++ b/Source/devtools/front_end/extensions/ExtensionServer.js
@@ -666,14 +666,12 @@ WebInspector.ExtensionServer.prototype = {
 
     _initExtensions: function()
     {
-        this._registerAutosubscriptionHandler(WebInspector.extensionAPI.Events.ConsoleMessageAdded,
-            WebInspector.multitargetConsoleModel, WebInspector.ConsoleModel.Events.MessageAdded, this._notifyConsoleMessageAdded);
-        this._registerAutosubscriptionHandler(WebInspector.extensionAPI.Events.NetworkRequestFinished,
-            WebInspector.networkManager, WebInspector.NetworkManager.EventTypes.RequestFinished, this._notifyRequestFinished);
+        this._registerAutosubscriptionTargetManagerHandler(WebInspector.extensionAPI.Events.ConsoleMessageAdded,
+            WebInspector.ConsoleModel, WebInspector.ConsoleModel.Events.MessageAdded, this._notifyConsoleMessageAdded);
         this._registerAutosubscriptionHandler(WebInspector.extensionAPI.Events.ResourceAdded,
-            WebInspector.workspace,
-            WebInspector.Workspace.Events.UISourceCodeAdded,
-            this._notifyResourceAdded);
+            WebInspector.workspace, WebInspector.Workspace.Events.UISourceCodeAdded, this._notifyResourceAdded);
+        this._registerAutosubscriptionTargetManagerHandler(WebInspector.extensionAPI.Events.NetworkRequestFinished,
+            WebInspector.NetworkManager, WebInspector.NetworkManager.EventTypes.RequestFinished, this._notifyResourceAdded);
 
         /**
          * @this {WebInspector.ExtensionServer}
@@ -871,6 +869,12 @@ WebInspector.ExtensionServer.prototype = {
         this._subscriptionStopHandlers[eventTopic] = onUnsubscribeLast;
     },
 
+    /**
+     * @param {string} eventTopic
+     * @param {!Object} eventTarget
+     * @param {string} frontendEventType
+     * @param {function(!WebInspector.Event)} handler
+     */
     _registerAutosubscriptionHandler: function(eventTopic, eventTarget, frontendEventType, handler)
     {
         this._registerSubscriptionHandler(eventTopic,
@@ -878,6 +882,19 @@ WebInspector.ExtensionServer.prototype = {
             eventTarget.removeEventListener.bind(eventTarget, frontendEventType, handler, this));
     },
 
+    /**
+     * @param {string} eventTopic
+     * @param {!Function} modelClass
+     * @param {string} frontendEventType
+     * @param {function(!WebInspector.Event)} handler
+     */
+    _registerAutosubscriptionTargetManagerHandler: function(eventTopic, modelClass, frontendEventType, handler)
+    {
+        this._registerSubscriptionHandler(eventTopic,
+            WebInspector.targetManager.addModelListener.bind(WebInspector.targetManager, modelClass, frontendEventType, handler, this),
+            WebInspector.targetManager.removeModelListener.bind(WebInspector.targetManager, modelClass, frontendEventType, handler, this));
+    },
+
     _registerResourceContentCommittedHandler: function(handler)
     {
         /**