Cleanup: Move kChromeDevToolsScheme constant into content namespace.

BUG=None
TEST=None, no functional changes
TBR=jam@chromium.org

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

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

37 files changed, 52 insertions, 53 deletions

diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc
index 31d0f31..2bcf22d 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
+++ b/android_webview/browser/net/aw_url_request_context_getter.cc
@@ -113,8 +113,8 @@ scoped_ptr<net::URLRequestJobFactory> CreateJobFactory(
       (*protocol_handlers)[content::kChromeUIScheme].release());
   DCHECK(set_protocol);
   set_protocol = aw_job_factory->SetProtocolHandler(
-      chrome::kChromeDevToolsScheme,
-      (*protocol_handlers)[chrome::kChromeDevToolsScheme].release());
+      content::kChromeDevToolsScheme,
+      (*protocol_handlers)[content::kChromeDevToolsScheme].release());
   DCHECK(set_protocol);
   protocol_handlers->clear();
 
diff --git a/apps/shell/browser/shell_content_browser_client.cc b/apps/shell/browser/shell_content_browser_client.cc
index aab0bf2..332aee2 100644
--- a/apps/shell/browser/shell_content_browser_client.cc
+++ b/apps/shell/browser/shell_content_browser_client.cc
@@ -76,7 +76,7 @@ bool ShellContentBrowserClient::IsHandledURL(const GURL& url) {
   // content::ShellURLRequestContextGetter::GetURLRequestContext().
   static const char* const kProtocolList[] = {
       chrome::kBlobScheme,
-      chrome::kChromeDevToolsScheme,
+      content::kChromeDevToolsScheme,
       content::kChromeUIScheme,
       content::kDataScheme,
       content::kFileScheme,
diff --git a/chrome/browser/browsing_data/browsing_data_helper.cc b/chrome/browser/browsing_data/browsing_data_helper.cc
index 105d575..580952b 100644
--- a/chrome/browser/browsing_data/browsing_data_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_helper.cc
@@ -28,7 +28,7 @@ bool BrowsingDataHelper::IsWebScheme(const std::string& scheme) {
         content::ChildProcessSecurityPolicy::GetInstance();
     return (policy->IsWebSafeScheme(scheme) &&
             !BrowsingDataHelper::IsExtensionScheme(scheme) &&
-            scheme != chrome::kChromeDevToolsScheme);
+            scheme != content::kChromeDevToolsScheme);
   }
 }
 
diff --git a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc
index 3f490db..a403a94 100644
--- a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc
@@ -71,7 +71,7 @@ TEST_F(BrowsingDataHelperTest, WebSafeSchemesAreWebSafe) {
 TEST_F(BrowsingDataHelperTest, ChromeSchemesAreNotWebSafe) {
   EXPECT_FALSE(IsWebScheme(extensions::kExtensionScheme));
   EXPECT_FALSE(IsWebScheme(chrome::kAboutScheme));
-  EXPECT_FALSE(IsWebScheme(chrome::kChromeDevToolsScheme));
+  EXPECT_FALSE(IsWebScheme(content::kChromeDevToolsScheme));
   EXPECT_FALSE(IsWebScheme(content::kChromeUIScheme));
   EXPECT_FALSE(IsWebScheme(content::kJavaScriptScheme));
   EXPECT_FALSE(IsWebScheme(content::kMailToScheme));
@@ -95,7 +95,7 @@ TEST_F(BrowsingDataHelperTest, ChromeSchemesAreNotAllExtension) {
   EXPECT_TRUE(IsExtensionScheme(extensions::kExtensionScheme));
 
   EXPECT_FALSE(IsExtensionScheme(chrome::kAboutScheme));
-  EXPECT_FALSE(IsExtensionScheme(chrome::kChromeDevToolsScheme));
+  EXPECT_FALSE(IsExtensionScheme(content::kChromeDevToolsScheme));
   EXPECT_FALSE(IsExtensionScheme(content::kChromeUIScheme));
   EXPECT_FALSE(IsExtensionScheme(content::kJavaScriptScheme));
   EXPECT_FALSE(IsExtensionScheme(content::kMailToScheme));
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 428cff0..b0e2bb0 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2541,7 +2541,7 @@ void ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
     std::vector<std::string>* additional_allowed_schemes) {
   ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
       additional_allowed_schemes);
-  additional_allowed_schemes->push_back(kChromeDevToolsScheme);
+  additional_allowed_schemes->push_back(content::kChromeDevToolsScheme);
   additional_allowed_schemes->push_back(content::kChromeUIScheme);
   additional_allowed_schemes->push_back(extensions::kExtensionScheme);
 }
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc
index 5871189..9a821f3 100644
--- a/chrome/browser/content_settings/host_content_settings_map.cc
+++ b/chrome/browser/content_settings/host_content_settings_map.cc
@@ -564,7 +564,7 @@ bool HostContentSettingsMap::ShouldAllowAllContent(
         return true;
     }
   }
-  return primary_url.SchemeIs(chrome::kChromeDevToolsScheme) ||
+  return primary_url.SchemeIs(content::kChromeDevToolsScheme) ||
          primary_url.SchemeIs(content::kChromeUIScheme);
 }
 
diff --git a/chrome/browser/custom_home_pages_table_model.cc b/chrome/browser/custom_home_pages_table_model.cc
index 46e3b25..95b25af 100644
--- a/chrome/browser/custom_home_pages_table_model.cc
+++ b/chrome/browser/custom_home_pages_table_model.cc
@@ -34,7 +34,7 @@ bool ShouldAddPage(const GURL& url) {
   if (url.is_empty())
     return false;
 
-  if (url.SchemeIs(chrome::kChromeDevToolsScheme))
+  if (url.SchemeIs(content::kChromeDevToolsScheme))
     return false;
 
   if (url.SchemeIs(content::kChromeUIScheme)) {
diff --git a/chrome/browser/devtools/devtools_file_helper.cc b/chrome/browser/devtools/devtools_file_helper.cc
index 46ae915..9ec7f90 100644
--- a/chrome/browser/devtools/devtools_file_helper.cc
+++ b/chrome/browser/devtools/devtools_file_helper.cc
@@ -144,7 +144,7 @@ std::string RegisterFileSystem(WebContents* web_contents,
                                const base::FilePath& path,
                                std::string* registered_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  CHECK(web_contents->GetURL().SchemeIs(chrome::kChromeDevToolsScheme));
+  CHECK(web_contents->GetURL().SchemeIs(content::kChromeDevToolsScheme));
   std::string file_system_id = isolated_context()->RegisterFileSystemForPath(
       fileapi::kFileSystemTypeNativeLocal, path, registered_name);
 
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
index 6081720..197725e 100644
--- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
@@ -860,7 +860,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestDevToolsExternalNavigation) {
   observer.Wait();
 
   ASSERT_TRUE(window_->web_contents()->GetURL().
-                  SchemeIs(chrome::kChromeDevToolsScheme));
+                  SchemeIs(content::kChromeDevToolsScheme));
   ASSERT_EQ(url, GetInspectedTab()->GetURL());
   CloseDevToolsWindow();
 }
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index 7b20f2e..5583240 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -805,7 +805,7 @@ content::WebContents* DevToolsWindow::OpenURLFromTab(
     content::WebContents* source,
     const content::OpenURLParams& params) {
   DCHECK(source == web_contents_);
-  if (!params.url.SchemeIs(chrome::kChromeDevToolsScheme)) {
+  if (!params.url.SchemeIs(content::kChromeDevToolsScheme)) {
     content::WebContents* inspected_web_contents = GetInspectedWebContents();
     return inspected_web_contents ?
         inspected_web_contents->OpenURL(params) : NULL;
@@ -1144,13 +1144,13 @@ void DevToolsWindow::AppendToFile(const std::string& url,
 }
 
 void DevToolsWindow::RequestFileSystems() {
-  CHECK(web_contents_->GetURL().SchemeIs(chrome::kChromeDevToolsScheme));
+  CHECK(web_contents_->GetURL().SchemeIs(content::kChromeDevToolsScheme));
   file_helper_->RequestFileSystems(base::Bind(
       &DevToolsWindow::FileSystemsLoaded, weak_factory_.GetWeakPtr()));
 }
 
 void DevToolsWindow::AddFileSystem() {
-  CHECK(web_contents_->GetURL().SchemeIs(chrome::kChromeDevToolsScheme));
+  CHECK(web_contents_->GetURL().SchemeIs(content::kChromeDevToolsScheme));
   file_helper_->AddFileSystem(
       base::Bind(&DevToolsWindow::FileSystemAdded, weak_factory_.GetWeakPtr()),
       base::Bind(&DevToolsWindow::ShowDevToolsConfirmInfoBar,
@@ -1158,7 +1158,7 @@ void DevToolsWindow::AddFileSystem() {
 }
 
 void DevToolsWindow::RemoveFileSystem(const std::string& file_system_path) {
-  CHECK(web_contents_->GetURL().SchemeIs(chrome::kChromeDevToolsScheme));
+  CHECK(web_contents_->GetURL().SchemeIs(content::kChromeDevToolsScheme));
   file_helper_->RemoveFileSystem(file_system_path);
   base::StringValue file_system_path_value(file_system_path);
   CallClientFunction("InspectorFrontendAPI.fileSystemRemoved",
@@ -1167,7 +1167,7 @@ void DevToolsWindow::RemoveFileSystem(const std::string& file_system_path) {
 
 void DevToolsWindow::UpgradeDraggedFileSystemPermissions(
     const std::string& file_system_url) {
-  CHECK(web_contents_->GetURL().SchemeIs(chrome::kChromeDevToolsScheme));
+  CHECK(web_contents_->GetURL().SchemeIs(content::kChromeDevToolsScheme));
   file_helper_->UpgradeDraggedFileSystemPermissions(
       file_system_url,
       base::Bind(&DevToolsWindow::FileSystemAdded, weak_factory_.GetWeakPtr()),
@@ -1178,7 +1178,7 @@ void DevToolsWindow::UpgradeDraggedFileSystemPermissions(
 void DevToolsWindow::IndexPath(int request_id,
                                const std::string& file_system_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  CHECK(web_contents_->GetURL().SchemeIs(chrome::kChromeDevToolsScheme));
+  CHECK(web_contents_->GetURL().SchemeIs(content::kChromeDevToolsScheme));
   if (!file_helper_->IsFileSystemAdded(file_system_path)) {
     IndexingDone(request_id, file_system_path);
     return;
@@ -1214,7 +1214,7 @@ void DevToolsWindow::SearchInPath(int request_id,
                                   const std::string& file_system_path,
                                   const std::string& query) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  CHECK(web_contents_->GetURL().SchemeIs(chrome::kChromeDevToolsScheme));
+  CHECK(web_contents_->GetURL().SchemeIs(content::kChromeDevToolsScheme));
   if (!file_helper_->IsFileSystemAdded(file_system_path)) {
     SearchCompleted(request_id, file_system_path, std::vector<std::string>());
     return;
diff --git a/chrome/browser/extensions/extension_special_storage_policy.cc b/chrome/browser/extensions/extension_special_storage_policy.cc
index 625805c..219e8ec 100644
--- a/chrome/browser/extensions/extension_special_storage_policy.cc
+++ b/chrome/browser/extensions/extension_special_storage_policy.cc
@@ -43,7 +43,7 @@ bool ExtensionSpecialStoragePolicy::IsStorageUnlimited(const GURL& origin) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUnlimitedStorage))
     return true;
 
-  if (origin.SchemeIs(chrome::kChromeDevToolsScheme) &&
+  if (origin.SchemeIs(content::kChromeDevToolsScheme) &&
       origin.host() == chrome::kChromeUIDevToolsHost)
     return true;
 
diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc
index f48ca5a..20b90f2 100644
--- a/chrome/browser/history/history_service.cc
+++ b/chrome/browser/history/history_service.cc
@@ -1008,12 +1008,12 @@ bool HistoryService::CanAddURL(const GURL& url) {
   // typed.  Right now, however, these are marked as typed even when triggered
   // by a shortcut or menu action.
   if (url.SchemeIs(content::kJavaScriptScheme) ||
-      url.SchemeIs(chrome::kChromeDevToolsScheme) ||
-      url.SchemeIs(chrome::kChromeNativeScheme) ||
+      url.SchemeIs(content::kChromeDevToolsScheme) ||
       url.SchemeIs(content::kChromeUIScheme) ||
+      url.SchemeIs(content::kViewSourceScheme) ||
+      url.SchemeIs(chrome::kChromeNativeScheme) ||
       url.SchemeIs(chrome::kChromeSearchScheme) ||
-      url.SchemeIs(chrome::kDomDistillerScheme) ||
-      url.SchemeIs(content::kViewSourceScheme))
+      url.SchemeIs(chrome::kDomDistillerScheme))
     return false;
 
   // Allow all about: and chrome: URLs except about:blank, since the user may
diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.cc b/chrome/browser/profiles/off_the_record_profile_io_data.cc
index 201a3d7..d614370 100644
--- a/chrome/browser/profiles/off_the_record_profile_io_data.cc
+++ b/chrome/browser/profiles/off_the_record_profile_io_data.cc
@@ -261,7 +261,7 @@ void OffTheRecordProfileIOData::
       content::CreateCookieStore(content::CookieStoreConfig())->
           GetCookieMonster();
   // Enable cookies for devtools and extension URLs.
-  const char* schemes[] = {chrome::kChromeDevToolsScheme,
+  const char* schemes[] = {content::kChromeDevToolsScheme,
                            extensions::kExtensionScheme};
   extensions_cookie_store->SetCookieableSchemes(schemes, 2);
   extensions_context->set_cookie_store(extensions_cookie_store);
diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
index d3a75c8..7d2e182 100644
--- a/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -514,7 +514,7 @@ void ProfileImplIOData::
   net::CookieStore* extensions_cookie_store =
       content::CreateCookieStore(cookie_config);
   // Enable cookies for devtools and extension URLs.
-  const char* schemes[] = {chrome::kChromeDevToolsScheme,
+  const char* schemes[] = {content::kChromeDevToolsScheme,
                            extensions::kExtensionScheme};
   extensions_cookie_store->GetCookieMonster()->SetCookieableSchemes(schemes, 2);
   extensions_context->set_cookie_store(extensions_cookie_store);
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index eab2ac6..467fa22 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -132,7 +132,7 @@ bool IsSupportedDevToolsURL(const GURL& url, base::FilePath* path) {
   std::string bundled_path_prefix(chrome::kChromeUIDevToolsBundledPath);
   bundled_path_prefix = "/" + bundled_path_prefix + "/";
 
-  if (!url.SchemeIs(chrome::kChromeDevToolsScheme) ||
+  if (!url.SchemeIs(content::kChromeDevToolsScheme) ||
       url.host() != chrome::kChromeUIDevToolsHost ||
       !StartsWithASCII(url.path(), bundled_path_prefix, false)) {
     return false;
@@ -607,7 +607,7 @@ bool ProfileIOData::IsHandledProtocol(const std::string& scheme) {
   DCHECK_EQ(scheme, StringToLowerASCII(scheme));
   static const char* const kProtocolList[] = {
     content::kFileScheme,
-    chrome::kChromeDevToolsScheme,
+    content::kChromeDevToolsScheme,
     chrome::kDomDistillerScheme,
     extensions::kExtensionScheme,
     extensions::kExtensionResourceScheme,
diff --git a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
index 55cf996..6d47d2b 100644
--- a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
+++ b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
@@ -51,7 +51,7 @@ RenderViewHost* FindFirstDevToolsHost() {
     RenderViewHost* host = RenderViewHost::From(widget);
     WebContents* contents = WebContents::FromRenderViewHost(host);
     GURL url = contents->GetURL();
-    if (url.SchemeIs(chrome::kChromeDevToolsScheme))
+    if (url.SchemeIs(content::kChromeDevToolsScheme))
       return host;
   }
   return NULL;
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index 58edbb8..99058ef 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -386,7 +386,7 @@ const size_t RenderViewContextMenu::kMaxSelectionTextLength = 50;
 
 // static
 bool RenderViewContextMenu::IsDevToolsURL(const GURL& url) {
-  return url.SchemeIs(chrome::kChromeDevToolsScheme);
+  return url.SchemeIs(content::kChromeDevToolsScheme);
 }
 
 // static
diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc
index c2e19d5..f010dc9 100644
--- a/chrome/browser/translate/translate_manager.cc
+++ b/chrome/browser/translate/translate_manager.cc
@@ -98,7 +98,7 @@ bool TranslateManager::IsTranslatableURL(const GURL& url) {
   //   confuse the CLD)
   return !url.is_empty() &&
          !url.SchemeIs(content::kChromeUIScheme) &&
-         !url.SchemeIs(chrome::kChromeDevToolsScheme) &&
+         !url.SchemeIs(content::kChromeDevToolsScheme) &&
 #if defined(OS_CHROMEOS)
          !(url.SchemeIs(extensions::kExtensionScheme) &&
            url.DomainIs(file_manager::kFileManagerAppId)) &&
diff --git a/chrome/browser/translate/translate_manager_unittest.cc b/chrome/browser/translate/translate_manager_unittest.cc
index bb9690c..5aee9ab 100644
--- a/chrome/browser/translate/translate_manager_unittest.cc
+++ b/chrome/browser/translate/translate_manager_unittest.cc
@@ -23,7 +23,7 @@ TEST_F(TranslateManagerTest, CheckTranslatableURL) {
   GURL chrome_url = GURL(chrome);
   EXPECT_FALSE(TranslateManager::IsTranslatableURL(chrome_url));
 
-  std::string devtools = std::string(chrome::kChromeDevToolsScheme) + "://";
+  std::string devtools = std::string(content::kChromeDevToolsScheme) + "://";
   GURL devtools_url = GURL(devtools);
   EXPECT_FALSE(TranslateManager::IsTranslatableURL(devtools_url));
 
diff --git a/chrome/browser/ui/toolbar/origin_chip.cc b/chrome/browser/ui/toolbar/origin_chip.cc
index e9caa30..e7c7174 100644
--- a/chrome/browser/ui/toolbar/origin_chip.cc
+++ b/chrome/browser/ui/toolbar/origin_chip.cc
@@ -149,8 +149,8 @@ base::string16 OriginChip::LabelFromURLForProfile(const GURL& provided_url,
   // to see. In these cases, the site chip will display the first
   // part of the full URL.
   if (url.SchemeIs(chrome::kBlobScheme) ||
-      url.SchemeIs(chrome::kChromeDevToolsScheme) ||
       url.SchemeIs(chrome::kChromeNativeScheme) ||
+      url.SchemeIs(content::kChromeDevToolsScheme) ||
       url.SchemeIs(content::kDataScheme) ||
       url.SchemeIs(content::kFileScheme) ||
       url.SchemeIs(content::kFileSystemScheme) ||
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 8628276..40f1616 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -225,7 +225,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
 
   // This will get called a lot to check all URLs, so do a quick check of other
   // schemes to filter out most URLs.
-  if (!url.SchemeIs(chrome::kChromeDevToolsScheme) &&
+  if (!url.SchemeIs(content::kChromeDevToolsScheme) &&
       !url.SchemeIs(content::kChromeUIScheme)) {
     return NULL;
   }
@@ -324,7 +324,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
   // Bookmarks are part of NTP on Android.
   if (url.host() == chrome::kChromeUIBookmarksHost)
     return &NewWebUI<BookmarksUI>;
-  if (url.SchemeIs(chrome::kChromeDevToolsScheme))
+  if (url.SchemeIs(content::kChromeDevToolsScheme))
     return &NewWebUI<DevToolsUI>;
   // Downloads list on Android uses the built-in download manager.
   if (url.host() == chrome::kChromeUIDownloadsHost)
diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc
index 6e02e89..d3cff30 100644
--- a/chrome/browser/ui/webui/devtools_ui.cc
+++ b/chrome/browser/ui/webui/devtools_ui.cc
@@ -203,7 +203,7 @@ GURL DevToolsUI::GetProxyURL(const std::string& frontend_url) {
     return GURL(kFallbackFrontendURL);
   }
   return GURL(base::StringPrintf("%s://%s/%s/%s",
-              chrome::kChromeDevToolsScheme,
+              content::kChromeDevToolsScheme,
               chrome::kChromeUIDevToolsHost,
               chrome::kChromeUIDevToolsRemotePath,
               url.path().substr(1).c_str()));
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 858990b..1ab1cc4 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -313,7 +313,7 @@ void ChromeContentRendererClient::RenderThreadStarted() {
   if (!command_line->HasSwitch(switches::kInstantProcess))
     WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(chrome_search_scheme);
 
-  WebString dev_tools_scheme(ASCIIToUTF16(chrome::kChromeDevToolsScheme));
+  WebString dev_tools_scheme(ASCIIToUTF16(content::kChromeDevToolsScheme));
   WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(dev_tools_scheme);
 
   WebString dom_distiller_scheme(ASCIIToUTF16(chrome::kDomDistillerScheme));
diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc
index 22a0a80..f5489a0 100644
--- a/chrome/renderer/content_settings_observer.cc
+++ b/chrome/renderer/content_settings_observer.cc
@@ -636,7 +636,7 @@ bool ContentSettingsObserver::IsWhitelistedForContentSettings(
   if (EqualsASCII(origin.protocol(), content::kChromeUIScheme))
     return true;  // Browser UI elements should still work.
 
-  if (EqualsASCII(origin.protocol(), chrome::kChromeDevToolsScheme))
+  if (EqualsASCII(origin.protocol(), content::kChromeDevToolsScheme))
     return true;  // DevTools UI elements should still work.
 
   if (EqualsASCII(origin.protocol(), extensions::kExtensionScheme))
diff --git a/chrome/renderer/content_settings_observer_unittest.cc b/chrome/renderer/content_settings_observer_unittest.cc
index 0c77d30..cb2f69d 100644
--- a/chrome/renderer/content_settings_observer_unittest.cc
+++ b/chrome/renderer/content_settings_observer_unittest.cc
@@ -26,7 +26,7 @@ TEST_F(ContentSettingsObserverTest, WhitelistedSchemes) {
       GURL()));
 
   GURL chrome_dev_tools_url =
-      GURL(std::string(chrome::kChromeDevToolsScheme).append(end_url));
+      GURL(std::string(content::kChromeDevToolsScheme).append(end_url));
   EXPECT_TRUE(ContentSettingsObserver::IsWhitelistedForContentSettings(
       WebSecurityOrigin::create(chrome_dev_tools_url),
       GURL()));
diff --git a/chrome/renderer/extensions/resource_request_policy.cc b/chrome/renderer/extensions/resource_request_policy.cc
index 3ddb491..cdce6f0 100644
--- a/chrome/renderer/extensions/resource_request_policy.cc
+++ b/chrome/renderer/extensions/resource_request_policy.cc
@@ -79,7 +79,7 @@ bool ResourceRequestPolicy::CanRequestResource(
         page_url.GetOrigin() == extension->url();
     // - devtools (chrome-extension:// URLs are loaded into frames of devtools
     //     to support the devtools extension APIs)
-    bool is_dev_tools = page_url.SchemeIs(chrome::kChromeDevToolsScheme) &&
+    bool is_dev_tools = page_url.SchemeIs(content::kChromeDevToolsScheme) &&
                         !ManifestURL::GetDevToolsPage(extension).is_empty();
     bool transition_allowed =
         !content::PageTransitionIsWebTriggerable(transition_type);
diff --git a/content/browser/browser_url_handler_impl.cc b/content/browser/browser_url_handler_impl.cc
index 27f2e4b..e5d1026 100644
--- a/content/browser/browser_url_handler_impl.cc
+++ b/content/browser/browser_url_handler_impl.cc
@@ -27,7 +27,7 @@ static bool HandleViewSource(GURL* url, BrowserContext* browser_context) {
       kHttpScheme,
       kHttpsScheme,
       kFtpScheme,
-      chrome::kChromeDevToolsScheme,
+      kChromeDevToolsScheme,
       kChromeUIScheme,
       kFileScheme,
       kFileSystemScheme
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 0f1bab5..7344248 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1782,7 +1782,7 @@ bool RenderProcessHost::ShouldUseProcessPerSite(
   // Note: DevTools pages have WebUI type but should not reuse the same host.
   if (WebUIControllerFactoryRegistry::GetInstance()->UseWebUIForURL(
           browser_context, url) &&
-      !url.SchemeIs(chrome::kChromeDevToolsScheme)) {
+      !url.SchemeIs(kChromeDevToolsScheme)) {
     return true;
   }
 
diff --git a/content/browser/storage_partition_impl_map.cc b/content/browser/storage_partition_impl_map.cc
index 16a11e4..b8f2fa4 100644
--- a/content/browser/storage_partition_impl_map.cc
+++ b/content/browser/storage_partition_impl_map.cc
@@ -406,7 +406,7 @@ StoragePartitionImpl* StoragePartitionImplMap::Get(
                 partition->GetAppCacheService(),
                 blob_storage_context));
   }
-  protocol_handlers[chrome::kChromeDevToolsScheme] =
+  protocol_handlers[kChromeDevToolsScheme] =
       linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
           CreateDevToolsProtocolHandler(browser_context_->GetResourceContext(),
                                         browser_context_->IsOffTheRecord()));
diff --git a/content/browser/webui/url_data_manager_backend.cc b/content/browser/webui/url_data_manager_backend.cc
index 35ea0c1..9313d9f 100644
--- a/content/browser/webui/url_data_manager_backend.cc
+++ b/content/browser/webui/url_data_manager_backend.cc
@@ -64,8 +64,7 @@ bool SchemeIsInSchemes(const std::string& scheme,
 // Returns whether |url| passes some sanity checks and is a valid GURL.
 bool CheckURLIsValid(const GURL& url) {
   std::vector<std::string> additional_schemes;
-  DCHECK(url.SchemeIs(chrome::kChromeDevToolsScheme) ||
-         url.SchemeIs(kChromeUIScheme) ||
+  DCHECK(url.SchemeIs(kChromeDevToolsScheme) || url.SchemeIs(kChromeUIScheme) ||
          (GetContentClient()->browser()->GetAdditionalWebUISchemes(
               &additional_schemes),
           SchemeIsInSchemes(url.scheme(), additional_schemes)));
diff --git a/content/common/savable_url_schemes.cc b/content/common/savable_url_schemes.cc
index f8845d6..e49fceb 100644
--- a/content/common/savable_url_schemes.cc
+++ b/content/common/savable_url_schemes.cc
@@ -18,7 +18,7 @@ const char* const kDefaultSavableSchemes[] = {
   kFileScheme,
   kFileSystemScheme,
   kFtpScheme,
-  chrome::kChromeDevToolsScheme,
+  kChromeDevToolsScheme,
   kChromeUIScheme,
   kDataScheme,
   NULL
diff --git a/content/common/url_schemes.cc b/content/common/url_schemes.cc
index 8479ce4..8ab7135 100644
--- a/content/common/url_schemes.cc
+++ b/content/common/url_schemes.cc
@@ -33,7 +33,7 @@ void RegisterContentSchemes(bool lock_standard_schemes) {
   GetContentClient()->AddAdditionalSchemes(&additional_standard_schemes,
                                            &additional_savable_schemes);
 
-  url_util::AddStandardScheme(chrome::kChromeDevToolsScheme);
+  url_util::AddStandardScheme(kChromeDevToolsScheme);
   url_util::AddStandardScheme(kChromeUIScheme);
   url_util::AddStandardScheme(kGuestScheme);
   url_util::AddStandardScheme(kMetadataScheme);
diff --git a/content/public/browser/url_data_source.cc b/content/public/browser/url_data_source.cc
index 96a2030..148e62a 100644
--- a/content/public/browser/url_data_source.cc
+++ b/content/public/browser/url_data_source.cc
@@ -46,7 +46,7 @@ bool URLDataSource::ShouldDenyXFrameOptions() const {
 }
 
 bool URLDataSource::ShouldServiceRequest(const net::URLRequest* request) const {
-  if (request->url().SchemeIs(chrome::kChromeDevToolsScheme) ||
+  if (request->url().SchemeIs(kChromeDevToolsScheme) ||
       request->url().SchemeIs(kChromeUIScheme))
     return true;
   return false;
diff --git a/content/public/common/url_constants.cc b/content/public/common/url_constants.cc
index fe58b0d..fe43e3c 100644
--- a/content/public/common/url_constants.cc
+++ b/content/public/common/url_constants.cc
@@ -9,13 +9,13 @@ namespace chrome {
 const char kAboutScheme[] = "about";
 const char kBlobScheme[] = "blob";
 
-// Before adding new chrome schemes please check with security@chromium.org.
-// There are security implications associated with introducing new schemes.
-const char kChromeDevToolsScheme[] = "chrome-devtools";
 }  // namespace chrome
 
 namespace content {
 
+// Before adding new chrome schemes please check with security@chromium.org.
+// There are security implications associated with introducing new schemes.
+const char kChromeDevToolsScheme[] = "chrome-devtools";
 const char kChromeUIScheme[] = "chrome";
 const char kDataScheme[] = "data";
 const char kFileScheme[] = "file";
diff --git a/content/public/common/url_constants.h b/content/public/common/url_constants.h
index a4cb86b..2bfc222 100644
--- a/content/public/common/url_constants.h
+++ b/content/public/common/url_constants.h
@@ -17,11 +17,11 @@ namespace chrome {
 // from there.
 CONTENT_EXPORT extern const char kAboutScheme[];
 CONTENT_EXPORT extern const char kBlobScheme[];
-CONTENT_EXPORT extern const char kChromeDevToolsScheme[];
 }  // namespace chrome
 
 namespace content {
 
+CONTENT_EXPORT extern const char kChromeDevToolsScheme[];
 CONTENT_EXPORT extern const char kChromeUIScheme[];  // Used for WebUIs.
 CONTENT_EXPORT extern const char kDataScheme[];
 CONTENT_EXPORT extern const char kFileScheme[];
diff --git a/content/public/common/url_utils.cc b/content/public/common/url_utils.cc
index bf37455..d2fb13b 100644
--- a/content/public/common/url_utils.cc
+++ b/content/public/common/url_utils.cc
@@ -24,7 +24,7 @@ const char* const* GetSavableSchemes() {
 bool HasWebUIScheme(const GURL& url) {
   return
 #if !defined(OS_IOS)
-         url.SchemeIs(chrome::kChromeDevToolsScheme) ||
+         url.SchemeIs(kChromeDevToolsScheme) ||
 #endif
          url.SchemeIs(kChromeUIScheme);
 }
diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
index 1b6407e..cae2dcd 100644
--- a/content/shell/browser/shell_content_browser_client.cc
+++ b/content/shell/browser/shell_content_browser_client.cc
@@ -182,7 +182,7 @@ bool ShellContentBrowserClient::IsHandledURL(const GURL& url) {
       chrome::kBlobScheme,
       kFileSystemScheme,
       kChromeUIScheme,
-      chrome::kChromeDevToolsScheme,
+      kChromeDevToolsScheme,
       kDataScheme,
       kFileScheme,
   };