Revert 137794 - Add schema chrome-extension-resource:// for extension resources. It may be used for bundle JS libraries in future

like Google Analytics JS library.

BUG=122987
TEST=unit_tests --gtest_filter=ExtensionFileUtil.*
TEST=browser_tests --gtest_filter=ExtensionResourceRequestPolicyTest*

Review URL: https://chromiumcodereview.appspot.com/9909019

TBR=penghuang@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10409019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137808 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 31 deletions

diff --git a/chrome/renderer/extensions/extension_resource_request_policy.cc b/chrome/renderer/extensions/extension_resource_request_policy.cc
index 6e62a85..c7b5b5a 100644
--- a/chrome/renderer/extensions/extension_resource_request_policy.cc
+++ b/chrome/renderer/extensions/extension_resource_request_policy.cc
@@ -81,27 +81,5 @@ bool ExtensionResourceRequestPolicy::CanRequestResource(
   return true;
 }
 
-// static
-bool ExtensionResourceRequestPolicy::CanRequestExtensionResourceScheme(
-    const GURL& resource_url,
-    WebKit::WebFrame* frame) {
-  CHECK(resource_url.SchemeIs(chrome::kExtensionResourceScheme));
-
-  GURL frame_url = frame->document().url();
-  if (!frame_url.is_empty() &&
-      !frame_url.SchemeIs(chrome::kExtensionScheme)) {
-    std::string message = base::StringPrintf(
-        "Denying load of %s. chrome-extension-resources:// can only be "
-        "loaded from extensions.",
-      resource_url.spec().c_str());
-    frame->addMessageToConsole(
-        WebKit::WebConsoleMessage(WebKit::WebConsoleMessage::LevelError,
-                                  WebKit::WebString::fromUTF8(message)));
-    return false;
-  }
-
-  return true;
-}
-
 ExtensionResourceRequestPolicy::ExtensionResourceRequestPolicy() {
 }
diff --git a/chrome/renderer/extensions/extension_resource_request_policy.h b/chrome/renderer/extensions/extension_resource_request_policy.h
index 329b5a0..cb59bca 100644
--- a/chrome/renderer/extensions/extension_resource_request_policy.h
+++ b/chrome/renderer/extensions/extension_resource_request_policy.h
@@ -12,20 +12,13 @@ namespace WebKit {
 class WebFrame;
 }
 
-// Encapsulates the policy for when chrome-extension:// and
-// chrome-extension-resource:// URLs can be requested.
+// Encapsulates the policy for when chrome-extension:// URLs can be requested.
 class ExtensionResourceRequestPolicy {
  public:
-  // Returns true if the chrome-extension:// |resource_url| can be requested
-  // from |frame_url|.
+  // Returns true if the |resource_url| can be requested from |frame_url|.
   static bool CanRequestResource(const GURL& resource_url,
                                  WebKit::WebFrame* frame,
                                  const ExtensionSet* loaded_extensions);
-  // Returns true if the chrome-extension-resource:// |resource_url| can be
-  // requested from |frame_url|.
-  static bool CanRequestExtensionResourceScheme(
-      const GURL& resource_url,
-      WebKit::WebFrame* frame);
 
  private:
   ExtensionResourceRequestPolicy();