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

Source/devtools/front_end/audits/AuditExtensionCategory.js

 /*
  * Copyright (C) 2012 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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
  * @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
      */
     get id()
     {
         return this._id;
     },
 
     /**
      * @override
      */
     get displayName()
     {
         return this._displayName;
     },
 
     /**
      * @override
      * @param {!WebInspector.Target} target
      * @param {!Array.<!WebInspector.NetworkRequest>} requests
             * @param {function(!WebInspector.AuditRuleResult)} ruleResultCallback
      * @param {function()} categoryDoneCallback
      * @param {!WebInspector.Progress} progress
      */
     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;
     this._ruleResultCallback = ruleResultCallback;
     this._categoryDoneCallback = categoryDoneCallback;
     this._progress = progress;
     this._progress.setTotalWork(1);
     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);
         result.addChild(description);
         result.severity = severity;
         if (details)
             this._addNode(result, details);
         this._addResult(result);
     },
 
     _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)
                 this._addNode(addedNode, node.children[i]);
         }
     },
 
     _addResult: function(result)
     {
         this._ruleResultCallback(result);
@@ skipping 17 matching lines @@
      * @param {string} expression
      * @param {?Object} evaluateOptions
      * @param {function(!WebInspector.RemoteObject)} callback
      */
     evaluate: function(expression, evaluateOptions, callback)
     {
         /**
          * @param {?string} error
          * @param {!RuntimeAgent.RemoteObject} result
          * @param {boolean=} wasThrown
-         * @this {WebInspector.ExtensionAuditCategoryResults}
+         * @this {WebInspector.AuditExtensionCategoryResults}
          */
         function onEvaluate(error, result, wasThrown)
         {
             if (wasThrown)
                 return;
             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
      * @return {!Element}
      */
     object: function(expression, title, evaluateOptions)
     {
         var parentElement = createElement("div");
         function onEvaluate(remoteObject)
         {
             var section = new WebInspector.ObjectPropertiesSection(remoteObject, title);
             section.expanded = true;
             section.editable = false;
             parentElement.appendChild(section.element);
         }
         this.evaluate(expression, evaluateOptions, onEvaluate);
         return parentElement;
     },
 
     /**
-     * @this {WebInspector.ExtensionAuditCategoryResults}
+     * @this {WebInspector.AuditExtensionCategoryResults}
      * @param {string} expression
      * @param {?Object} evaluateOptions
      * @return {!Element}
      */
     node: function(expression, evaluateOptions)
     {
         var parentElement = createElement("div");
         this.evaluate(expression, evaluateOptions, onEvaluate);
 
         /**
          * @param {!WebInspector.RemoteObject} remoteObject
          */
         function onEvaluate(remoteObject)
         {
             WebInspector.Renderer.renderPromise(remoteObject).then(appendRenderer).thenOrCatch(remoteObject.release.bind(remoteObject)).done();
 
             /**
              * @param {!Element} element
              */
             function appendRenderer(element)
             {
                 parentElement.appendChild(element);
             }
         }
         return parentElement;
     }
 }
 
-WebInspector.ExtensionAuditCategoryResults._lastId = 0;
+WebInspector.AuditExtensionCategoryResults._lastId = 0;