Move some content url constants to /url.

This CL moves the content url constants below to /url:
  content::kBlobScheme
  content::kDataScheme
  content::kFileScheme
  content::kFileSystemScheme
  content::kFtpScheme
  content::kJavaScriptScheme
  content::kMailToScheme

This is a follow up to https://codereview.chromium.org/254763005.

BUG=306258
TBR=finnur@chromium.org,mkosiba@chromium.org,derat@chromium.org
TEST=compile

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

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

31 files changed, 85 insertions, 85 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_input.cc b/chrome/browser/autocomplete/autocomplete_input.cc
index d81e728..af34933 100644
--- a/chrome/browser/autocomplete/autocomplete_input.cc
+++ b/chrome/browser/autocomplete/autocomplete_input.cc
@@ -161,7 +161,7 @@ AutocompleteInput::Type AutocompleteInput::Parse(
   if (!canonicalized_url->is_valid())
     return QUERY;
 
-  if (LowerCaseEqualsASCII(parsed_scheme, content::kFileScheme)) {
+  if (LowerCaseEqualsASCII(parsed_scheme, url::kFileScheme)) {
     // A user might or might not type a scheme when entering a file URL.  In
     // either case, |parsed_scheme| will tell us that this is a file URL, but
     // |parts->scheme| might be empty, e.g. if the user typed "C:\foo".
@@ -184,8 +184,8 @@ AutocompleteInput::Type AutocompleteInput::Parse(
     // still claim to handle them.
     if (ProfileIOData::IsHandledProtocol(base::UTF16ToASCII(parsed_scheme)) ||
         LowerCaseEqualsASCII(parsed_scheme, content::kViewSourceScheme) ||
-        LowerCaseEqualsASCII(parsed_scheme, content::kJavaScriptScheme) ||
-        LowerCaseEqualsASCII(parsed_scheme, content::kDataScheme))
+        LowerCaseEqualsASCII(parsed_scheme, url::kJavaScriptScheme) ||
+        LowerCaseEqualsASCII(parsed_scheme, url::kDataScheme))
       return URL;
 
     // Not an internal protocol.  Check and see if the user has explicitly
@@ -456,7 +456,7 @@ void AutocompleteInput::ParseForEmphasizeComponents(const base::string16& text,
         host->reset();
       }
     }
-  } else if (LowerCaseEqualsASCII(scheme_str, content::kFileSystemScheme) &&
+  } else if (LowerCaseEqualsASCII(scheme_str, url::kFileSystemScheme) &&
              parts.inner_parsed() && parts.inner_parsed()->scheme.is_valid()) {
     *host = parts.inner_parsed()->host;
   }
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc
index 6260cf6..22b8bb3 100644
--- a/chrome/browser/autocomplete/search_provider.cc
+++ b/chrome/browser/autocomplete/search_provider.cc
@@ -39,7 +39,6 @@
 #include "chrome/browser/ui/search/instant_controller.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/common/url_constants.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
@@ -49,6 +48,7 @@
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "url/url_constants.h"
 #include "url/url_util.h"
 
 // Helpers --------------------------------------------------------------------
@@ -564,7 +564,7 @@ bool SearchProvider::IsQuerySuitableForSuggest() const {
   // assume we're OK.
   if (!LowerCaseEqualsASCII(input_.scheme(), url::kHttpScheme) &&
       !LowerCaseEqualsASCII(input_.scheme(), url::kHttpsScheme) &&
-      !LowerCaseEqualsASCII(input_.scheme(), content::kFtpScheme))
+      !LowerCaseEqualsASCII(input_.scheme(), url::kFtpScheme))
     return (input_.type() == AutocompleteInput::QUERY);
 
   // Don't send URLs with usernames, queries or refs.  Some of these are
diff --git a/chrome/browser/browsing_data/browsing_data_helper.cc b/chrome/browser/browsing_data/browsing_data_helper.cc
index 580952b..a110d6c 100644
--- a/chrome/browser/browsing_data/browsing_data_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_helper.cc
@@ -17,7 +17,7 @@
 bool BrowsingDataHelper::IsWebScheme(const std::string& scheme) {
   // Special-case `file://` scheme iff cookies and site data are enabled via
   // the `--allow-file-cookies` CLI flag.
-  if (scheme == content::kFileScheme) {
+  if (scheme == url::kFileScheme) {
     return CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnableFileCookies);
 
diff --git a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc
index 5e3dd80..f39c4a9 100644
--- a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc
@@ -7,10 +7,10 @@
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/mock_extension_special_storage_policy.h"
 #include "chrome/common/url_constants.h"
-#include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
+#include "url/url_constants.h"
 
 namespace {
 
@@ -60,11 +60,11 @@ class BrowsingDataHelperTest : public testing::Test {
 TEST_F(BrowsingDataHelperTest, WebSafeSchemesAreWebSafe) {
   EXPECT_TRUE(IsWebScheme(url::kHttpScheme));
   EXPECT_TRUE(IsWebScheme(url::kHttpsScheme));
-  EXPECT_TRUE(IsWebScheme(content::kFtpScheme));
-  EXPECT_TRUE(IsWebScheme(content::kDataScheme));
+  EXPECT_TRUE(IsWebScheme(url::kFtpScheme));
+  EXPECT_TRUE(IsWebScheme(url::kDataScheme));
   EXPECT_TRUE(IsWebScheme("feed"));
-  EXPECT_TRUE(IsWebScheme(content::kBlobScheme));
-  EXPECT_TRUE(IsWebScheme(content::kFileSystemScheme));
+  EXPECT_TRUE(IsWebScheme(url::kBlobScheme));
+  EXPECT_TRUE(IsWebScheme(url::kFileSystemScheme));
   EXPECT_FALSE(IsWebScheme("invalid-scheme-i-just-made-up"));
 }
 
@@ -73,8 +73,8 @@ TEST_F(BrowsingDataHelperTest, ChromeSchemesAreNotWebSafe) {
   EXPECT_FALSE(IsWebScheme(content::kAboutScheme));
   EXPECT_FALSE(IsWebScheme(content::kChromeDevToolsScheme));
   EXPECT_FALSE(IsWebScheme(content::kChromeUIScheme));
-  EXPECT_FALSE(IsWebScheme(content::kJavaScriptScheme));
-  EXPECT_FALSE(IsWebScheme(content::kMailToScheme));
+  EXPECT_FALSE(IsWebScheme(url::kJavaScriptScheme));
+  EXPECT_FALSE(IsWebScheme(url::kMailToScheme));
   EXPECT_FALSE(IsWebScheme(content::kMetadataScheme));
   EXPECT_FALSE(IsWebScheme(content::kSwappedOutScheme));
   EXPECT_FALSE(IsWebScheme(content::kViewSourceScheme));
@@ -83,11 +83,11 @@ TEST_F(BrowsingDataHelperTest, ChromeSchemesAreNotWebSafe) {
 TEST_F(BrowsingDataHelperTest, WebSafeSchemesAreNotExtensions) {
   EXPECT_FALSE(IsExtensionScheme(url::kHttpScheme));
   EXPECT_FALSE(IsExtensionScheme(url::kHttpsScheme));
-  EXPECT_FALSE(IsExtensionScheme(content::kFtpScheme));
-  EXPECT_FALSE(IsExtensionScheme(content::kDataScheme));
+  EXPECT_FALSE(IsExtensionScheme(url::kFtpScheme));
+  EXPECT_FALSE(IsExtensionScheme(url::kDataScheme));
   EXPECT_FALSE(IsExtensionScheme("feed"));
-  EXPECT_FALSE(IsExtensionScheme(content::kBlobScheme));
-  EXPECT_FALSE(IsExtensionScheme(content::kFileSystemScheme));
+  EXPECT_FALSE(IsExtensionScheme(url::kBlobScheme));
+  EXPECT_FALSE(IsExtensionScheme(url::kFileSystemScheme));
   EXPECT_FALSE(IsExtensionScheme("invalid-scheme-i-just-made-up"));
 }
 
@@ -97,8 +97,8 @@ TEST_F(BrowsingDataHelperTest, ChromeSchemesAreNotAllExtension) {
   EXPECT_FALSE(IsExtensionScheme(content::kAboutScheme));
   EXPECT_FALSE(IsExtensionScheme(content::kChromeDevToolsScheme));
   EXPECT_FALSE(IsExtensionScheme(content::kChromeUIScheme));
-  EXPECT_FALSE(IsExtensionScheme(content::kJavaScriptScheme));
-  EXPECT_FALSE(IsExtensionScheme(content::kMailToScheme));
+  EXPECT_FALSE(IsExtensionScheme(url::kJavaScriptScheme));
+  EXPECT_FALSE(IsExtensionScheme(url::kMailToScheme));
   EXPECT_FALSE(IsExtensionScheme(content::kMetadataScheme));
   EXPECT_FALSE(IsExtensionScheme(content::kSwappedOutScheme));
   EXPECT_FALSE(IsExtensionScheme(content::kViewSourceScheme));
diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc
index 0fb14e5..b6bb571 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.cc
+++ b/chrome/browser/browsing_data/cookies_tree_model.cc
@@ -72,7 +72,7 @@ std::string CanonicalizeHost(const GURL& url) {
   // "google.com".
 
   if (url.SchemeIsFile()) {
-    return std::string(content::kFileScheme) +
+    return std::string(url::kFileScheme) +
            content::kStandardSchemeSeparator;
   }
 
@@ -559,7 +559,7 @@ CookieTreeNode::DetailedInfo CookieTreeRootNode::GetDetailedInfo() const {
 // static
 base::string16 CookieTreeHostNode::TitleForUrl(const GURL& url) {
   const std::string file_origin_node_name(
-      std::string(content::kFileScheme) + content::kStandardSchemeSeparator);
+      std::string(url::kFileScheme) + content::kStandardSchemeSeparator);
   return base::UTF8ToUTF16(url.SchemeIsFile() ? file_origin_node_name
                                               : url.host());
 }
@@ -583,7 +583,7 @@ CookieTreeHostNode::~CookieTreeHostNode() {}
 
 const std::string CookieTreeHostNode::GetHost() const {
   const std::string file_origin_node_name(
-      std::string(content::kFileScheme) + content::kStandardSchemeSeparator);
+      std::string(url::kFileScheme) + content::kStandardSchemeSeparator);
   return url_.SchemeIsFile() ? file_origin_node_name : url_.host();
 }
 
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
index 8821fca..6c6292d 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -1173,7 +1173,7 @@ bool TabsUpdateFunction::UpdateURL(const std::string &url_string,
 
   // JavaScript URLs can do the same kinds of things as cross-origin XHR, so
   // we need to check host permissions before allowing them.
-  if (url.SchemeIs(content::kJavaScriptScheme)) {
+  if (url.SchemeIs(url::kJavaScriptScheme)) {
     content::RenderProcessHost* process = web_contents_->GetRenderProcessHost();
     if (!PermissionsData::CanExecuteScriptOnPage(
             GetExtension(),
@@ -1210,7 +1210,7 @@ bool TabsUpdateFunction::UpdateURL(const std::string &url_string,
 
   // The URL of a tab contents never actually changes to a JavaScript URL, so
   // this check only makes sense in other cases.
-  if (!url.SchemeIs(content::kJavaScriptScheme))
+  if (!url.SchemeIs(url::kJavaScriptScheme))
     DCHECK_EQ(url.spec(), web_contents_->GetURL().spec());
 
   return true;
diff --git a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
index 9cd4349..c322615 100644
--- a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
+++ b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc
@@ -17,11 +17,11 @@ const char* kValidSchemes[] = {
     content::kChromeUIScheme,
     url::kHttpScheme,
     url::kHttpsScheme,
-    content::kFileScheme,
-    content::kFtpScheme,
-    content::kJavaScriptScheme,
-    content::kDataScheme,
-    content::kFileSystemScheme,
+    url::kFileScheme,
+    url::kFtpScheme,
+    url::kJavaScriptScheme,
+    url::kDataScheme,
+    url::kFileSystemScheme,
 };
 
 }  // namespace
diff --git a/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc b/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc
index 1c62081..5e24399 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc
@@ -17,7 +17,6 @@
 #include "chrome/browser/extensions/extension_warning_set.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/renderer_host/web_cache_manager.h"
-#include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "extensions/browser/extension_system.h"
@@ -27,6 +26,7 @@
 #include "net/cookies/parsed_cookie.h"
 #include "net/http/http_util.h"
 #include "net/url_request/url_request.h"
+#include "url/url_constants.h"
 
 // TODO(battre): move all static functions into an anonymous namespace at the
 // top of this file.
@@ -427,7 +427,7 @@ static bool MergeRedirectUrlOfResponsesHelper(
     if ((*delta)->new_url.is_empty())
       continue;
     if (consider_only_cancel_scheme_urls &&
-        !(*delta)->new_url.SchemeIs(content::kDataScheme) &&
+        !(*delta)->new_url.SchemeIs(url::kDataScheme) &&
         (*delta)->new_url.spec() != "about:blank") {
       continue;
     }
diff --git a/chrome/browser/extensions/api/web_request/web_request_permissions.cc b/chrome/browser/extensions/api/web_request/web_request_permissions.cc
index 3bda598..2625c20 100644
--- a/chrome/browser/extensions/api/web_request/web_request_permissions.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_permissions.cc
@@ -69,9 +69,9 @@ bool IsSensitiveURL(const GURL& url) {
 // covered by CanExtensionAccessURL.
 bool HasWebRequestScheme(const GURL& url) {
   return (url.SchemeIs(content::kAboutScheme) ||
-          url.SchemeIs(content::kFileScheme) ||
-          url.SchemeIs(content::kFileSystemScheme) ||
-          url.SchemeIs(content::kFtpScheme) ||
+          url.SchemeIs(url::kFileScheme) ||
+          url.SchemeIs(url::kFileSystemScheme) ||
+          url.SchemeIs(url::kFtpScheme) ||
           url.SchemeIs(url::kHttpScheme) ||
           url.SchemeIs(url::kHttpsScheme) ||
           url.SchemeIs(extensions::kExtensionScheme));
diff --git a/chrome/browser/guest_view/web_view/web_view_guest.cc b/chrome/browser/guest_view/web_view/web_view_guest.cc
index ae77819..981e166 100644
--- a/chrome/browser/guest_view/web_view/web_view_guest.cc
+++ b/chrome/browser/guest_view/web_view/web_view_guest.cc
@@ -1071,7 +1071,7 @@ void WebViewGuest::NavigateGuest(const std::string& src) {
       (!content::ChildProcessSecurityPolicy::GetInstance()->IsWebSafeScheme(
           url.scheme()) &&
       !url.SchemeIs(content::kAboutScheme)) ||
-      url.SchemeIs(content::kJavaScriptScheme);
+      url.SchemeIs(url::kJavaScriptScheme);
   if (scheme_is_blocked || !url.is_valid()) {
     std::string error_type;
     base::RemoveChars(net::ErrorToString(net::ERR_ABORTED), "net::",
diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc
index 41cc227..37322e3 100644
--- a/chrome/browser/history/history_backend.cc
+++ b/chrome/browser/history/history_backend.cc
@@ -407,7 +407,7 @@ void HistoryBackend::AddPage(const HistoryAddPageArgs& request) {
         request.redirects[0] : request.url);
     if (origin_url.SchemeIs(url::kHttpScheme) ||
         origin_url.SchemeIs(url::kHttpsScheme) ||
-        origin_url.SchemeIs(content::kFtpScheme)) {
+        origin_url.SchemeIs(url::kFtpScheme)) {
       std::string host(origin_url.host());
       size_t registry_length =
           net::registry_controlled_domains::GetRegistryLength(
diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc
index 2f3a300..3a4c0a5 100644
--- a/chrome/browser/history/history_service.cc
+++ b/chrome/browser/history/history_service.cc
@@ -979,7 +979,7 @@ bool HistoryService::CanAddURL(const GURL& url) {
   // TODO: We should allow kChromeUIScheme URLs if they have been explicitly
   // typed.  Right now, however, these are marked as typed even when triggered
   // by a shortcut or menu action.
-  if (url.SchemeIs(content::kJavaScriptScheme) ||
+  if (url.SchemeIs(url::kJavaScriptScheme) ||
       url.SchemeIs(content::kChromeDevToolsScheme) ||
       url.SchemeIs(content::kChromeUIScheme) ||
       url.SchemeIs(content::kViewSourceScheme) ||
diff --git a/chrome/browser/history/in_memory_url_index.cc b/chrome/browser/history/in_memory_url_index.cc
index cb09763..029e56a 100644
--- a/chrome/browser/history/in_memory_url_index.cc
+++ b/chrome/browser/history/in_memory_url_index.cc
@@ -40,11 +40,11 @@ void InitializeSchemeWhitelist(std::set<std::string>* whitelist) {
     return;  // Nothing to do, already initialized.
   whitelist->insert(std::string(content::kAboutScheme));
   whitelist->insert(std::string(content::kChromeUIScheme));
-  whitelist->insert(std::string(content::kFileScheme));
-  whitelist->insert(std::string(content::kFtpScheme));
+  whitelist->insert(std::string(url::kFileScheme));
+  whitelist->insert(std::string(url::kFtpScheme));
   whitelist->insert(std::string(url::kHttpScheme));
   whitelist->insert(std::string(url::kHttpsScheme));
-  whitelist->insert(std::string(content::kMailToScheme));
+  whitelist->insert(std::string(url::kMailToScheme));
 }
 
 // Restore/SaveCacheObserver ---------------------------------------------------
diff --git a/chrome/browser/history/url_database.cc b/chrome/browser/history/url_database.cc
index 9de3e1a..e114afe 100644
--- a/chrome/browser/history/url_database.cc
+++ b/chrome/browser/history/url_database.cc
@@ -315,7 +315,7 @@ bool URLDatabase::IsTypedHost(const std::string& host) {
   const char* schemes[] = {
     url::kHttpScheme,
     url::kHttpsScheme,
-    content::kFtpScheme
+    url::kFtpScheme
   };
   URLRows dummy;
   for (size_t i = 0; i < arraysize(schemes); ++i) {
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 540a26f..6893de8 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -41,7 +41,6 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/common/url_constants.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_prefs.h"
 #include "components/data_reduction_proxy/browser/http_auth_handler_data_reduction_proxy.h"
 #include "components/policy/core/common/policy_service.h"
@@ -80,6 +79,7 @@
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "net/url_request/url_request_throttler_manager.h"
 #include "net/websockets/websocket_job.h"
+#include "url/url_constants.h"
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
 #include "policy/policy_constants.h"
@@ -655,10 +655,10 @@ void IOThread::InitAsync() {
   TRACE_EVENT_END0("startup", "IOThread::InitAsync:HttpNetworkSession");
   scoped_ptr<net::URLRequestJobFactoryImpl> job_factory(
       new net::URLRequestJobFactoryImpl());
-  job_factory->SetProtocolHandler(content::kDataScheme,
+  job_factory->SetProtocolHandler(url::kDataScheme,
                                   new net::DataProtocolHandler());
   job_factory->SetProtocolHandler(
-      content::kFileScheme,
+      url::kFileScheme,
       new net::FileProtocolHandler(
           content::BrowserThread::GetBlockingPool()->
               GetTaskRunnerWithShutdownBehavior(
@@ -667,7 +667,7 @@ void IOThread::InitAsync() {
   globals_->proxy_script_fetcher_ftp_transaction_factory.reset(
       new net::FtpNetworkLayer(globals_->host_resolver.get()));
   job_factory->SetProtocolHandler(
-      content::kFtpScheme,
+      url::kFtpScheme,
       new net::FtpProtocolHandler(
           globals_->proxy_script_fetcher_ftp_transaction_factory.get()));
 #endif
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 520e762..918f919 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -613,22 +613,22 @@ ProfileIOData* ProfileIOData::FromResourceContext(
 bool ProfileIOData::IsHandledProtocol(const std::string& scheme) {
   DCHECK_EQ(scheme, StringToLowerASCII(scheme));
   static const char* const kProtocolList[] = {
-    content::kFileScheme,
+    url::kFileScheme,
     content::kChromeDevToolsScheme,
     chrome::kDomDistillerScheme,
     extensions::kExtensionScheme,
     extensions::kExtensionResourceScheme,
     content::kChromeUIScheme,
-    content::kDataScheme,
+    url::kDataScheme,
 #if defined(OS_CHROMEOS)
     chrome::kDriveScheme,
 #endif  // defined(OS_CHROMEOS)
     content::kAboutScheme,
 #if !defined(DISABLE_FTP_SUPPORT)
-    content::kFtpScheme,
+    url::kFtpScheme,
 #endif  // !defined(DISABLE_FTP_SUPPORT)
-    content::kBlobScheme,
-    content::kFileSystemScheme,
+    url::kBlobScheme,
+    url::kFileSystemScheme,
     chrome::kChromeSearchScheme,
   };
   for (size_t i = 0; i < arraysize(kProtocolList); ++i) {
@@ -1031,7 +1031,7 @@ scoped_ptr<net::URLRequestJobFactory> ProfileIOData::SetUpJobFactoryDefaults(
   // NOTE(willchan): Keep these protocol handlers in sync with
   // ProfileIOData::IsHandledProtocol().
   bool set_protocol = job_factory->SetProtocolHandler(
-      content::kFileScheme,
+      url::kFileScheme,
       new net::FileProtocolHandler(
           content::BrowserThread::GetBlockingPool()->
               GetTaskRunnerWithShutdownBehavior(
@@ -1051,7 +1051,7 @@ scoped_ptr<net::URLRequestJobFactory> ProfileIOData::SetUpJobFactoryDefaults(
       CreateExtensionResourceProtocolHandler());
   DCHECK(set_protocol);
   set_protocol = job_factory->SetProtocolHandler(
-      content::kDataScheme, new net::DataProtocolHandler());
+      url::kDataScheme, new net::DataProtocolHandler());
   DCHECK(set_protocol);
 #if defined(OS_CHROMEOS)
   if (!IsOffTheRecord() && profile_params_) {
@@ -1067,7 +1067,7 @@ scoped_ptr<net::URLRequestJobFactory> ProfileIOData::SetUpJobFactoryDefaults(
 #if !defined(DISABLE_FTP_SUPPORT)
   DCHECK(ftp_transaction_factory);
   job_factory->SetProtocolHandler(
-      content::kFtpScheme,
+      url::kFtpScheme,
       new net::FtpProtocolHandler(ftp_transaction_factory));
 #endif  // !defined(DISABLE_FTP_SUPPORT)
 
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
index 661db61..be70702 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -803,7 +803,7 @@ void RenderViewContextMenu::AppendLinkItems() {
 
   menu_model_.AddItemWithStringId(
       IDC_CONTENT_CONTEXT_COPYLINKLOCATION,
-      params_.link_url.SchemeIs(content::kMailToScheme) ?
+      params_.link_url.SchemeIs(url::kMailToScheme) ?
           IDS_CONTENT_CONTEXT_COPYEMAILADDRESS :
           IDS_CONTENT_CONTEXT_COPYLINKLOCATION);
 }
diff --git a/chrome/browser/renderer_host/offline_resource_throttle.cc b/chrome/browser/renderer_host/offline_resource_throttle.cc
index f37b998..272785c 100644
--- a/chrome/browser/renderer_host/offline_resource_throttle.cc
+++ b/chrome/browser/renderer_host/offline_resource_throttle.cc
@@ -13,7 +13,6 @@
 #include "base/strings/string_util.h"
 #include "chrome/browser/chromeos/offline/offline_load_page.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
-#include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_controller.h"
@@ -24,6 +23,7 @@
 #include "net/base/network_change_notifier.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
+#include "url/url_constants.h"
 #include "webkit/browser/appcache/appcache_service.h"
 
 using content::BrowserThread;
@@ -118,7 +118,7 @@ void OfflineResourceThrottle::OnBlockingPageComplete(bool proceed) {
 }
 
 bool OfflineResourceThrottle::IsRemote(const GURL& url) const {
-  return !net::IsLocalhost(url.host()) && (url.SchemeIs(content::kFtpScheme) ||
+  return !net::IsLocalhost(url.host()) && (url.SchemeIs(url::kFtpScheme) ||
                                            url.SchemeIs(url::kHttpScheme) ||
                                            url.SchemeIs(url::kHttpsScheme));
 }
diff --git a/chrome/browser/safe_browsing/database_manager.cc b/chrome/browser/safe_browsing/database_manager.cc
index ca5ecba..fa0a46e 100644
--- a/chrome/browser/safe_browsing/database_manager.cc
+++ b/chrome/browser/safe_browsing/database_manager.cc
@@ -30,10 +30,10 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/url_constants.h"
 #include "components/startup_metric_utils/startup_metric_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
+#include "url/url_constants.h"
 
 using content::BrowserThread;
 
@@ -221,7 +221,7 @@ SafeBrowsingDatabaseManager::~SafeBrowsingDatabaseManager() {
 }
 
 bool SafeBrowsingDatabaseManager::CanCheckUrl(const GURL& url) const {
-  return url.SchemeIs(content::kFtpScheme) ||
+  return url.SchemeIs(url::kFtpScheme) ||
          url.SchemeIs(url::kHttpScheme) ||
          url.SchemeIs(url::kHttpsScheme);
 }
diff --git a/chrome/browser/search_engines/template_url_parser.cc b/chrome/browser/search_engines/template_url_parser.cc
index 5669a2c..6fe0b86 100644
--- a/chrome/browser/search_engines/template_url_parser.cc
+++ b/chrome/browser/search_engines/template_url_parser.cc
@@ -16,11 +16,11 @@
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
-#include "chrome/common/url_constants.h"
 #include "libxml/parser.h"
 #include "libxml/xmlwriter.h"
 #include "ui/gfx/favicon_size.h"
 #include "url/gurl.h"
+#include "url/url_constants.h"
 
 namespace {
 
@@ -246,7 +246,7 @@ void TemplateURLParsingContext::EndElementImpl(void* ctx, const xmlChar* name) {
       break;
     case TemplateURLParsingContext::IMAGE: {
       GURL image_url(base::UTF16ToUTF8(context->string_));
-      if (image_url.SchemeIs(content::kDataScheme)) {
+      if (image_url.SchemeIs(url::kDataScheme)) {
         // TODO (jcampan): bug 1169256: when dealing with data URL, we need to
         // decode the data URL in the renderer. For now, we'll just point to the
         // favicon from the URL.
diff --git a/chrome/browser/translate/translate_service.cc b/chrome/browser/translate/translate_service.cc
index a1899a8..5507846 100644
--- a/chrome/browser/translate/translate_service.cc
+++ b/chrome/browser/translate/translate_service.cc
@@ -131,5 +131,5 @@ bool TranslateService::IsTranslatableURL(const GURL& url) {
          !(url.SchemeIs(extensions::kExtensionScheme) &&
            url.DomainIs(file_manager::kFileManagerAppId)) &&
 #endif
-         !url.SchemeIs(content::kFtpScheme);
+         !url.SchemeIs(url::kFtpScheme);
 }
diff --git a/chrome/browser/translate/translate_service_unittest.cc b/chrome/browser/translate/translate_service_unittest.cc
index 9628fce..fa9574c 100644
--- a/chrome/browser/translate/translate_service_unittest.cc
+++ b/chrome/browser/translate/translate_service_unittest.cc
@@ -33,7 +33,7 @@ TEST(TranslateServiceTest, CheckTranslatableURL) {
   EXPECT_FALSE(TranslateService::IsTranslatableURL(filemanager_url));
 #endif
 
-  std::string ftp = std::string(content::kFtpScheme) + "://google.com/pub";
+  std::string ftp = std::string(url::kFtpScheme) + "://google.com/pub";
   GURL ftp_url = GURL(ftp);
   EXPECT_FALSE(TranslateService::IsTranslatableURL(ftp_url));
 
diff --git a/chrome/browser/ui/app_list/search/common/webservice_search_provider.cc b/chrome/browser/ui/app_list/search/common/webservice_search_provider.cc
index 73bcf1db..a7bcf57 100644
--- a/chrome/browser/ui/app_list/search/common/webservice_search_provider.cc
+++ b/chrome/browser/ui/app_list/search/common/webservice_search_provider.cc
@@ -12,8 +12,8 @@
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/app_list/search/common/webservice_cache.h"
 #include "chrome/browser/ui/app_list/search/common/webservice_cache_factory.h"
-#include "chrome/common/url_constants.h"
 #include "url/gurl.h"
+#include "url/url_constants.h"
 
 namespace app_list {
 
@@ -71,7 +71,7 @@ bool WebserviceSearchProvider::IsSensitiveInput(const base::string16& query) {
   // file, we shouldn't send it. Sending such things is a waste of time and a
   // disclosure of potentially private, local data. If the scheme is OK, we
   // still need to check other cases below.
-  if (LowerCaseEqualsASCII(query_as_url.scheme(), content::kFileScheme))
+  if (LowerCaseEqualsASCII(query_as_url.scheme(), url::kFileScheme))
     return true;
 
   // Don't send URLs with usernames, queries or refs. Some of these are
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index d0dff8f..094aec1 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -1109,7 +1109,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutFile) {
       FILE_PATH_LITERAL("empty.html");
   GURL file_url(ui_test_utils::GetTestUrl(base::FilePath(
       base::FilePath::kCurrentDirectory), base::FilePath(kEmptyFile)));
-  ASSERT_TRUE(file_url.SchemeIs(content::kFileScheme));
+  ASSERT_TRUE(file_url.SchemeIs(url::kFileScheme));
   ui_test_utils::NavigateToURL(browser(), file_url);
   EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
 }
@@ -1148,7 +1148,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutFtp) {
                                      base::FilePath(kDocRoot));
   ASSERT_TRUE(test_server.Start());
   GURL ftp_url(test_server.GetURL(std::string()));
-  ASSERT_TRUE(ftp_url.SchemeIs(content::kFtpScheme));
+  ASSERT_TRUE(ftp_url.SchemeIs(url::kFtpScheme));
   ui_test_utils::NavigateToURL(browser(), ftp_url);
   EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
 }
@@ -1254,7 +1254,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_FaviconChange) {
       FILE_PATH_LITERAL("onload_change_favicon.html");
   GURL file_url(ui_test_utils::GetTestUrl(base::FilePath(
       base::FilePath::kCurrentDirectory), base::FilePath(kFile)));
-  ASSERT_TRUE(file_url.SchemeIs(content::kFileScheme));
+  ASSERT_TRUE(file_url.SchemeIs(url::kFileScheme));
   ui_test_utils::NavigateToURL(browser(), file_url);
 
   NavigationEntry* entry = browser()->tab_strip_model()->
diff --git a/chrome/browser/ui/cocoa/drag_util.mm b/chrome/browser/ui/cocoa/drag_util.mm
index 7dff793..d1dfd37 100644
--- a/chrome/browser/ui/cocoa/drag_util.mm
+++ b/chrome/browser/ui/cocoa/drag_util.mm
@@ -7,7 +7,6 @@
 #include "base/files/file_path.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/plugin_service.h"
-#include "content/public/common/url_constants.h"
 #include "content/public/common/webplugininfo.h"
 #include "ipc/ipc_message.h"
 #include "net/base/filename_util.h"
@@ -15,6 +14,7 @@
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 #import "ui/base/dragdrop/cocoa_dnd_util.h"
 #include "url/gurl.h"
+#include "url/url_constants.h"
 
 using content::PluginService;
 
@@ -58,7 +58,7 @@ GURL GetFileURLFromDropData(id<NSDraggingInfo> info) {
                                           [info draggingPasteboard],
                                           YES);
 
-    if (url.SchemeIs(content::kFileScheme))
+    if (url.SchemeIs(url::kFileScheme))
       return url;
   }
   return GURL();
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
index 27ee8ca..432bbc8 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
@@ -818,7 +818,7 @@ class NotificationBridge
   GURL url(URLFixerUpper::FixupURL(
       base::SysNSStringToUTF8([urls objectAtIndex:0]), std::string()));
 
-  if (url.SchemeIs(content::kJavaScriptScheme)) {
+  if (url.SchemeIs(url::kJavaScriptScheme)) {
     browser_->window()->GetLocationBar()->GetOmniboxView()->SetUserText(
           OmniboxView::StripJavascriptSchemas(base::UTF8ToUTF16(url.spec())));
   }
diff --git a/chrome/browser/ui/omnibox/omnibox_view.cc b/chrome/browser/ui/omnibox/omnibox_view.cc
index 22b9732..46ec47a 100644
--- a/chrome/browser/ui/omnibox/omnibox_view.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view.cc
@@ -24,7 +24,7 @@
 // static
 base::string16 OmniboxView::StripJavascriptSchemas(const base::string16& text) {
   const base::string16 kJsPrefix(
-      base::ASCIIToUTF16(content::kJavaScriptScheme) + base::ASCIIToUTF16(":"));
+      base::ASCIIToUTF16(url::kJavaScriptScheme) + base::ASCIIToUTF16(":"));
   base::string16 out(text);
   while (StartsWith(out, kJsPrefix, false)) {
     base::TrimWhitespace(out.substr(kJsPrefix.length()), base::TRIM_LEADING,
diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc
index 122e0a4..0971f0e 100644
--- a/chrome/browser/ui/startup/startup_browser_creator.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator.cc
@@ -438,7 +438,7 @@ std::vector<GURL> StartupBrowserCreator::GetURLsFromCommandLine(
       ChildProcessSecurityPolicy* policy =
           ChildProcessSecurityPolicy::GetInstance();
       if (policy->IsWebSafeScheme(url.scheme()) ||
-          url.SchemeIs(content::kFileScheme) ||
+          url.SchemeIs(url::kFileScheme) ||
 #if defined(OS_CHROMEOS)
           // In ChromeOS, allow a settings page to be specified on the
           // command line. See ExistingUserController::OnLoginSuccess.
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index d912d94..0dcc7db 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -503,7 +503,7 @@ bool StartupBrowserCreatorImpl::OpenApplicationWindow(
     ChildProcessSecurityPolicy* policy =
         ChildProcessSecurityPolicy::GetInstance();
     if (policy->IsWebSafeScheme(url.scheme()) ||
-        url.SchemeIs(content::kFileScheme)) {
+        url.SchemeIs(url::kFileScheme)) {
       const extensions::Extension* extension =
           extensions::ExtensionRegistry::Get(profile)
               ->enabled_extensions().GetAppByURL(url);
diff --git a/chrome/browser/ui/toolbar/origin_chip_info.cc b/chrome/browser/ui/toolbar/origin_chip_info.cc
index 66034df..bc5e601 100644
--- a/chrome/browser/ui/toolbar/origin_chip_info.cc
+++ b/chrome/browser/ui/toolbar/origin_chip_info.cc
@@ -197,7 +197,7 @@ base::string16 OriginChip::LabelFromURLForProfile(const GURL& provided_url,
         base::UTF8ToUTF16(extension->name()) : base::UTF8ToUTF16(url.host());
   }
 
-  if (url.SchemeIsHTTPOrHTTPS() || url.SchemeIs(content::kFtpScheme)) {
+  if (url.SchemeIsHTTPOrHTTPS() || url.SchemeIs(url::kFtpScheme)) {
     // See ToolbarModelImpl::GetText(). Does not pay attention to any user
     // edits, and uses GetURL/net::FormatUrl -- We don't really care about
     // length or the autocomplete parser.
@@ -230,14 +230,14 @@ 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::kChromeNativeScheme) ||
-      url.SchemeIs(content::kBlobScheme) ||
+      url.SchemeIs(url::kBlobScheme) ||
       url.SchemeIs(content::kChromeDevToolsScheme) ||
-      url.SchemeIs(content::kDataScheme) ||
-      url.SchemeIs(content::kFileScheme) ||
-      url.SchemeIs(content::kFileSystemScheme) ||
+      url.SchemeIs(url::kDataScheme) ||
+      url.SchemeIs(url::kFileScheme) ||
+      url.SchemeIs(url::kFileSystemScheme) ||
       url.SchemeIs(content::kGuestScheme) ||
-      url.SchemeIs(content::kJavaScriptScheme) ||
-      url.SchemeIs(content::kMailToScheme) ||
+      url.SchemeIs(url::kJavaScriptScheme) ||
+      url.SchemeIs(url::kMailToScheme) ||
       url.SchemeIs(content::kMetadataScheme) ||
       url.SchemeIs(content::kSwappedOutScheme)) {
     std::string truncated_url;
diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc
index 1d88667..7f99645 100644
--- a/chrome/browser/web_applications/web_app.cc
+++ b/chrome/browser/web_applications/web_app.cc
@@ -20,7 +20,6 @@
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
@@ -32,6 +31,7 @@
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_family.h"
 #include "ui/gfx/image/image_skia.h"
+#include "url/url_constants.h"
 
 #if defined(OS_WIN)
 #include "ui/gfx/icon_util.h"
@@ -403,9 +403,9 @@ void UpdateAllShortcuts(const base::string16& old_app_title,
 
 bool IsValidUrl(const GURL& url) {
   static const char* const kValidUrlSchemes[] = {
-      content::kFileScheme,
-      content::kFileSystemScheme,
-      content::kFtpScheme,
+      url::kFileScheme,
+      url::kFileSystemScheme,
+      url::kFtpScheme,
       url::kHttpScheme,
       url::kHttpsScheme,
       extensions::kExtensionScheme,