AppCache: unconditionally allow chrome-devtools scheme for processing.

BUG=315167
R=michaeln@chromium.org

Review URL: https://codereview.chromium.org/58833008

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

3 files changed, 2 insertions, 19 deletions

diff --git a/content/renderer/devtools/devtools_client.cc b/content/renderer/devtools/devtools_client.cc
index 41b9481..3d51312 100644
--- a/content/renderer/devtools/devtools_client.cc
+++ b/content/renderer/devtools/devtools_client.cc
@@ -16,7 +16,6 @@
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebDevToolsFrontend.h"
 #include "ui/base/ui_base_switches.h"
-#include "webkit/common/appcache/appcache_interfaces.h"
 
 using blink::WebDevToolsFrontend;
 using blink::WebString;
@@ -31,7 +30,6 @@ DevToolsClient::DevToolsClient(RenderViewImpl* render_view)
           render_view->webview(),
           this,
           ASCIIToUTF16(command_line.GetSwitchValueASCII(switches::kLang))));
-  appcache::AddSupportedScheme(chrome::kChromeDevToolsScheme);
 }
 
 DevToolsClient::~DevToolsClient() {
diff --git a/webkit/common/appcache/appcache_interfaces.cc b/webkit/common/appcache/appcache_interfaces.cc
index 0703451..ca43f35 100644
--- a/webkit/common/appcache/appcache_interfaces.cc
+++ b/webkit/common/appcache/appcache_interfaces.cc
@@ -6,22 +6,15 @@
 
 #include <set>
 
-#include "base/lazy_instance.h"
 #include "base/strings/string_util.h"
 #include "net/url_request/url_request.h"
 #include "url/gurl.h"
 
-namespace {
-
-base::LazyInstance<std::set<std::string> >::Leaky g_supported_schemes =
-    LAZY_INSTANCE_INITIALIZER;
-
-}  // namespace
-
 namespace appcache {
 
 const char kHttpScheme[] = "http";
 const char kHttpsScheme[] = "https";
+const char kDevToolsScheme[] = "chrome-devtools";
 const char kHttpGETMethod[] = "GET";
 const char kHttpHEADMethod[] = "HEAD";
 
@@ -96,15 +89,9 @@ bool Namespace::IsMatch(const GURL& url) const {
   return StartsWithASCII(url.spec(), namespace_url.spec(), true);
 }
 
-void AddSupportedScheme(const char* scheme) {
-  g_supported_schemes.Get().insert(scheme);
-}
-
 bool IsSchemeSupported(const GURL& url) {
   bool supported = url.SchemeIs(kHttpScheme) || url.SchemeIs(kHttpsScheme) ||
-      (!(g_supported_schemes == NULL) &&
-       g_supported_schemes.Get().find(url.scheme()) !=
-           g_supported_schemes.Get().end());
+      url.SchemeIs(kDevToolsScheme);
 
 #ifndef NDEBUG
   // TODO(michaeln): It would be really nice if this could optionally work for
diff --git a/webkit/common/appcache/appcache_interfaces.h b/webkit/common/appcache/appcache_interfaces.h
index e33cd88..4accecf 100644
--- a/webkit/common/appcache/appcache_interfaces.h
+++ b/webkit/common/appcache/appcache_interfaces.h
@@ -178,8 +178,6 @@ WEBKIT_STORAGE_COMMON_EXPORT extern const char kHttpHEADMethod[];
 // CommandLine flag to turn this experimental feature on.
 WEBKIT_STORAGE_COMMON_EXPORT extern const char kEnableExecutableHandlers[];
 
-WEBKIT_STORAGE_COMMON_EXPORT void AddSupportedScheme(const char* scheme);
-
 WEBKIT_STORAGE_COMMON_EXPORT bool IsSchemeSupported(const GURL& url);
 WEBKIT_STORAGE_COMMON_EXPORT bool IsMethodSupported(const std::string& method);
 WEBKIT_STORAGE_COMMON_EXPORT bool IsSchemeAndMethodSupported(