DevTools: make extension server a part of core, panels' code should depend on it.

Source/devtools/front_end/audits/AuditExtensionCategory.js

Index: Source/devtools/front_end/audits/AuditExtensionCategory.js
diff --git a/Source/devtools/front_end/extensions/ExtensionAuditCategory.js b/Source/devtools/front_end/audits/AuditExtensionCategory.js
similarity index 82%
copy from Source/devtools/front_end/extensions/ExtensionAuditCategory.js
copy to Source/devtools/front_end/audits/AuditExtensionCategory.js
index ddbb45cf29a5296b77c43de9e61eff3c2841237e..85b2bc4318ef7cb236ec72056e9e8ba1fc56ed95 100644
--- a/Source/devtools/front_end/extensions/ExtensionAuditCategory.js
+++ b/Source/devtools/front_end/audits/AuditExtensionCategory.js
@@ -31,22 +31,20 @@
 /**
  * @constructor
  * @implements {WebInspector.AuditCategory}
- * @param {!WebInspector.ExtensionServer} server
  * @param {string} extensionOrigin
  * @param {string} id
  * @param {string} displayName
  * @param {number=} ruleCount
  */
-WebInspector.ExtensionAuditCategory = function(server, extensionOrigin, id, displayName, ruleCount)
+WebInspector.AuditExtensionCategory = function(extensionOrigin, id, displayName, ruleCount)
 {
-    this._server = server;
     this._extensionOrigin = extensionOrigin;
     this._id = id;
     this._displayName = displayName;
     this._ruleCount  = ruleCount;
 }
 
-WebInspector.ExtensionAuditCategory.prototype = {
+WebInspector.AuditExtensionCategory.prototype = {
     /**
      * @override
      */
@@ -73,20 +71,21 @@ WebInspector.ExtensionAuditCategory.prototype = {
      */
     run: function(target, requests, ruleResultCallback, categoryDoneCallback, progress)
     {
-        var results = new WebInspector.ExtensionAuditCategoryResults(this, target, ruleResultCallback, categoryDoneCallback, progress);
-        this._server.startAuditRun(this, results);
+        var results = new WebInspector.AuditExtensionCategoryResults(this, target, ruleResultCallback, categoryDoneCallback, progress);
+        WebInspector.extensionServer.startAuditRun(this.id, results);
     }
 }
 
 /**
  * @constructor
- * @param {!WebInspector.ExtensionAuditCategory} category
+ * @implements {WebInspector.ExtensionAuditCategoryResults}
+ * @param {!WebInspector.AuditExtensionCategory} category
  * @param {!WebInspector.Target} target
  * @param {function(!WebInspector.AuditRuleResult)} ruleResultCallback
  * @param {function()} categoryDoneCallback
  * @param {!WebInspector.Progress} progress
  */
-WebInspector.ExtensionAuditCategoryResults = function(category, target, ruleResultCallback, categoryDoneCallback, progress)
+WebInspector.AuditExtensionCategoryResults = function(category, target, ruleResultCallback, categoryDoneCallback, progress)
 {
     this._target = target;
     this._category = category;
@@ -97,17 +96,31 @@ WebInspector.ExtensionAuditCategoryResults = function(category, target, ruleResu
     this._expectedResults = category._ruleCount;
     this._actualResults = 0;
 
-    this.id = category.id + "-" + ++WebInspector.ExtensionAuditCategoryResults._lastId;
+    this._id = category.id + "-" + ++WebInspector.AuditExtensionCategoryResults._lastId;
 }
 
-WebInspector.ExtensionAuditCategoryResults.prototype = {
+WebInspector.AuditExtensionCategoryResults.prototype = {
+    /**
+     * @return {string}
+     */
+    id: function()
+    {
+        return this._id;
+    },
+
     done: function()
     {
-        this._category._server.stopAuditRun(this);
+        WebInspector.extensionServer.stopAuditRun(this);
         this._progress.done();
         this._categoryDoneCallback();
     },
 
+    /**
+     * @param {string} displayName
+     * @param {string} description
+     * @param {string} severity
+     * @param {!Object} details
+     */
     addResult: function(displayName, description, severity, details)
     {
         var result = new WebInspector.AuditRuleResult(displayName);
@@ -120,7 +133,7 @@ WebInspector.ExtensionAuditCategoryResults.prototype = {
 
     _addNode: function(parent, node)
     {
-        var contents = WebInspector.auditFormatters.partiallyApply(WebInspector.ExtensionAuditFormatters, this, node.contents);
+        var contents = WebInspector.auditFormatters.partiallyApply(WebInspector.AuditExtensionFormatters, this, node.contents);
         var addedNode = parent.addChild(contents, node.expanded);
         if (node.children) {
             for (var i = 0; i < node.children.length; ++i)
@@ -158,7 +171,7 @@ WebInspector.ExtensionAuditCategoryResults.prototype = {
          * @param {?string} error
          * @param {!RuntimeAgent.RemoteObject} result
          * @param {boolean=} wasThrown
-         * @this {WebInspector.ExtensionAuditCategoryResults}
+         * @this {WebInspector.AuditExtensionCategoryResults}
          */
         function onEvaluate(error, result, wasThrown)
         {
@@ -167,13 +180,13 @@ WebInspector.ExtensionAuditCategoryResults.prototype = {
             var object = this._target.runtimeModel.createRemoteObject(result);
             callback(object);
         }
-        this._category._server.evaluate(expression, false, false, evaluateOptions, this._category._extensionOrigin, onEvaluate.bind(this));
+        WebInspector.extensionServer.evaluate(expression, false, false, evaluateOptions, this._category._extensionOrigin, onEvaluate.bind(this));
     }
 }
 
-WebInspector.ExtensionAuditFormatters = {
+WebInspector.AuditExtensionFormatters = {
     /**
-     * @this {WebInspector.ExtensionAuditCategoryResults}
+     * @this {WebInspector.AuditExtensionCategoryResults}
      * @param {string} expression
      * @param {string} title
      * @param {?Object} evaluateOptions
@@ -194,7 +207,7 @@ WebInspector.ExtensionAuditFormatters = {
     },
 
     /**
-     * @this {WebInspector.ExtensionAuditCategoryResults}
+     * @this {WebInspector.AuditExtensionCategoryResults}
      * @param {string} expression
      * @param {?Object} evaluateOptions
      * @return {!Element}
@@ -223,4 +236,4 @@ WebInspector.ExtensionAuditFormatters = {
     }
 }
 
-WebInspector.ExtensionAuditCategoryResults._lastId = 0;
+WebInspector.AuditExtensionCategoryResults._lastId = 0;