DevTools: Extenstions: use request.contentEncoded for GetRequestContent

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 524 matching lines @@
             if (!resources[contentProvider.contentURL()])
                 resources[contentProvider.contentURL()] = this._makeResource(contentProvider);
         }
         var uiSourceCodes = WebInspector.workspace.uiSourceCodesForProjectType(WebInspector.projectTypes.Network);
         uiSourceCodes = uiSourceCodes.concat(WebInspector.workspace.uiSourceCodesForProjectType(WebInspector.projectTypes.ContentScripts));
         uiSourceCodes.forEach(pushResourceData.bind(this));
         WebInspector.resourceTreeModel.forAllResources(pushResourceData.bind(this));
         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}
          */
         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)
     {
         var url = /** @type {string} */ (message.url);
         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)
     {
         /**
          * @param {?Protocol.Error} error
          * @this {WebInspector.ExtensionServer}
          */
         function callbackWrapper(error)
         {
@@ skipping 501 matching lines @@
 {
     if (WebInspector.extensionServer._overridePlatformExtensionAPIForTest)
         window.buildPlatformExtensionAPI = WebInspector.extensionServer._overridePlatformExtensionAPIForTest;
     WebInspector.extensionServer._addExtensions(extensions);
 }
 
 WebInspector.setInspectedTabId = function(tabId)
 {
     WebInspector._inspectedTabId = tabId;
 }