DevTools: Extenstions: use request.contentEncoded for GetRequestContent

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 9d1842b9714129a34a9a7e4aec928ae96fda65c5..845f75ac096509f9f2dd2ed3700a14e2bea9eaa6 100644
--- a/Source/devtools/front_end/extensions/ExtensionServer.js
+++ b/Source/devtools/front_end/extensions/ExtensionServer.js
@@ -542,13 +542,12 @@ WebInspector.ExtensionServer.prototype = {
         return Object.values(resources);
     },
 
-    /**
-     * @param {!WebInspector.ContentProvider} contentProvider
-     * @param {!Object} message
-     * @param {!MessagePort} port
-     */
-    _getResourceContent: function(contentProvider, message, port)
+    _onGetRequestContent: function(message, port)
     {
+        var request = this._requestById(message.id);
+        if (!request)
+            return this._status.E_NOTFOUND(message.id);
+
         /**
          * @param {?string} content
          * @this {WebInspector.ExtensionServer}
@@ -556,21 +555,13 @@ WebInspector.ExtensionServer.prototype = {
         function onContentAvailable(content)
         {
             var response = {
-                encoding: (content === null) || contentProvider.contentType().isTextType() ? "" : "base64",
+                encoding: content && request.contentEncoded ? "base64" : "",

[vsevik, 2014/10/22 14:25:07]

We could use contentEncoded for both of them

[eustas, 2014/10/23 13:40:55]

Done.

                 content: content
             };
             this._dispatchCallback(message.requestId, port, response);
         }
 
-        contentProvider.requestContent(onContentAvailable.bind(this));
-    },
-
-    _onGetRequestContent: function(message, port)
-    {
-        var request = this._requestById(message.id);
-        if (!request)
-            return this._status.E_NOTFOUND(message.id);
-        this._getResourceContent(request, message, port);
+        request.requestContent(onContentAvailable.bind(this));
     },
 
     _onGetResourceContent: function(message, port)
@@ -579,7 +570,21 @@ WebInspector.ExtensionServer.prototype = {
         var contentProvider = WebInspector.workspace.uiSourceCodeForOriginURL(url) || WebInspector.resourceForURL(url);
         if (!contentProvider)
             return this._status.E_NOTFOUND(url);
-        this._getResourceContent(contentProvider, message, port);
+
+        /**
+         * @param {?string} content
+         * @this {WebInspector.ExtensionServer}
+         */
+        function onContentAvailable(content)
+        {
+            var response = {
+                encoding: (content === null) || contentProvider.contentType().isTextType() ? "" : "base64",
+                content: content
+            };
+            this._dispatchCallback(message.requestId, port, response);
+        }
+
+        contentProvider.requestContent(onContentAvailable.bind(this));
     },
 
     _onSetResourceContent: function(message, port)