Move kDataScheme constant into content namespace.

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

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

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

13 files changed, 13 insertions, 14 deletions

diff --git a/content/browser/android/load_url_params.cc b/content/browser/android/load_url_params.cc
index 57eff2d..2c49e97 100644
--- a/content/browser/android/load_url_params.cc
+++ b/content/browser/android/load_url_params.cc
@@ -39,7 +39,7 @@ bool RegisterLoadUrlParams(JNIEnv* env) {
 
 jboolean IsDataScheme(JNIEnv* env, jclass clazz, jstring jurl) {
   GURL url(base::android::ConvertJavaStringToUTF8(env, jurl));
-  return url.SchemeIs(chrome::kDataScheme);
+  return url.SchemeIs(kDataScheme);
 }
 
 }  // namespace content
diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
index 3b8db44..0b67427 100644
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -311,7 +311,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() {
   RegisterWebSafeScheme(kHttpScheme);
   RegisterWebSafeScheme(kHttpsScheme);
   RegisterWebSafeScheme(kFtpScheme);
-  RegisterWebSafeScheme(chrome::kDataScheme);
+  RegisterWebSafeScheme(kDataScheme);
   RegisterWebSafeScheme("feed");
   RegisterWebSafeScheme(chrome::kBlobScheme);
   RegisterWebSafeScheme(kFileSystemScheme);
diff --git a/content/browser/child_process_security_policy_unittest.cc b/content/browser/child_process_security_policy_unittest.cc
index b5f7df0..c74294f 100644
--- a/content/browser/child_process_security_policy_unittest.cc
+++ b/content/browser/child_process_security_policy_unittest.cc
@@ -123,7 +123,7 @@ TEST_F(ChildProcessSecurityPolicyTest, IsWebSafeSchemeTest) {
   EXPECT_TRUE(p->IsWebSafeScheme(kHttpScheme));
   EXPECT_TRUE(p->IsWebSafeScheme(kHttpsScheme));
   EXPECT_TRUE(p->IsWebSafeScheme(kFtpScheme));
-  EXPECT_TRUE(p->IsWebSafeScheme(chrome::kDataScheme));
+  EXPECT_TRUE(p->IsWebSafeScheme(kDataScheme));
   EXPECT_TRUE(p->IsWebSafeScheme("feed"));
   EXPECT_TRUE(p->IsWebSafeScheme(chrome::kBlobScheme));
   EXPECT_TRUE(p->IsWebSafeScheme(kFileSystemScheme));
diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc
index 33dd5d0..ae41845 100644
--- a/content/browser/download/save_package.cc
+++ b/content/browser/download/save_package.cc
@@ -1222,7 +1222,7 @@ base::FilePath SavePackage::GetSuggestedNameForSaveAs(
   // similarly).
   if (title_ == net::FormatUrl(page_url_, accept_langs)) {
     std::string url_path;
-    if (!page_url_.SchemeIs(chrome::kDataScheme)) {
+    if (!page_url_.SchemeIs(kDataScheme)) {
       std::vector<std::string> url_parts;
       base::SplitString(page_url_.path(), '/', &url_parts);
       if (!url_parts.empty()) {
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
index 0526f69..c2ae947 100644
--- a/content/browser/frame_host/navigation_controller_impl.cc
+++ b/content/browser/frame_host/navigation_controller_impl.cc
@@ -654,7 +654,7 @@ void NavigationControllerImpl::LoadURLWithParams(const LoadURLParams& params) {
       }
       break;
     case LOAD_TYPE_DATA:
-      if (!params.url.SchemeIs(chrome::kDataScheme)) {
+      if (!params.url.SchemeIs(kDataScheme)) {
         NOTREACHED() << "Data load must use data scheme.";
         return;
       }
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index 7464e6c..d485fd9 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -572,7 +572,7 @@ void RenderViewHostImpl::Navigate(const ViewMsg_Navigate_Params& params) {
   if (!GetProcess()->IsGuest()) {
     ChildProcessSecurityPolicyImpl::GetInstance()->GrantRequestURL(
         GetProcess()->GetID(), params.url);
-    if (params.url.SchemeIs(chrome::kDataScheme) &&
+    if (params.url.SchemeIs(kDataScheme) &&
         params.base_url_for_data_url.SchemeIs(kFileScheme)) {
       // If 'data:' is used, and we have a 'file:' base url, grant access to
       // local files.
diff --git a/content/common/savable_url_schemes.cc b/content/common/savable_url_schemes.cc
index 74f59e6..0880dc6 100644
--- a/content/common/savable_url_schemes.cc
+++ b/content/common/savable_url_schemes.cc
@@ -20,7 +20,7 @@ const char* const kDefaultSavableSchemes[] = {
   kFtpScheme,
   chrome::kChromeDevToolsScheme,
   chrome::kChromeUIScheme,
-  chrome::kDataScheme,
+  kDataScheme,
   NULL
 };
 
diff --git a/content/public/common/url_constants.cc b/content/public/common/url_constants.cc
index 8bd370e..a1a4117 100644
--- a/content/public/common/url_constants.cc
+++ b/content/public/common/url_constants.cc
@@ -13,11 +13,11 @@ const char kBlobScheme[] = "blob";
 // There are security implications associated with introducing new schemes.
 const char kChromeDevToolsScheme[] = "chrome-devtools";
 const char kChromeUIScheme[] = "chrome";
-const char kDataScheme[] = "data";
 }  // namespace chrome
 
 namespace content {
 
+const char kDataScheme[] = "data";
 const char kFileScheme[] = "file";
 const char kFileSystemScheme[] = "filesystem";
 const char kFtpScheme[] = "ftp";
diff --git a/content/public/common/url_constants.h b/content/public/common/url_constants.h
index 14439cb..5459ce4 100644
--- a/content/public/common/url_constants.h
+++ b/content/public/common/url_constants.h
@@ -19,11 +19,11 @@ CONTENT_EXPORT extern const char kAboutScheme[];
 CONTENT_EXPORT extern const char kBlobScheme[];
 CONTENT_EXPORT extern const char kChromeDevToolsScheme[];
 CONTENT_EXPORT extern const char kChromeUIScheme[];  // Used for WebUIs.
-CONTENT_EXPORT extern const char kDataScheme[];
 }  // namespace chrome
 
 namespace content {
 
+CONTENT_EXPORT extern const char kDataScheme[];
 CONTENT_EXPORT extern const char kFileScheme[];
 CONTENT_EXPORT extern const char kFileSystemScheme[];
 CONTENT_EXPORT extern const char kFtpScheme[];
diff --git a/content/renderer/image_loading_helper.cc b/content/renderer/image_loading_helper.cc
index 8f403bb..a1d6f94 100644
--- a/content/renderer/image_loading_helper.cc
+++ b/content/renderer/image_loading_helper.cc
@@ -110,7 +110,7 @@ void ImageLoadingHelper::OnDownloadImage(int id,
                                          uint32_t max_image_size) {
   std::vector<SkBitmap> result_images;
   std::vector<gfx::Size> result_original_image_sizes;
-  if (image_url.SchemeIs(chrome::kDataScheme)) {
+  if (image_url.SchemeIs(kDataScheme)) {
     SkBitmap data_image = ImageFromDataUrl(image_url);
     if (!data_image.empty()) {
       result_images.push_back(ResizeImage(data_image, max_image_size));
diff --git a/content/renderer/web_ui_extension.cc b/content/renderer/web_ui_extension.cc
index b49241e..fe2fea7 100644
--- a/content/renderer/web_ui_extension.cc
+++ b/content/renderer/web_ui_extension.cc
@@ -93,7 +93,7 @@ bool WebUIExtensionWrapper::ShouldRespondToRequest(
   bool webui_enabled =
       (render_view->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI) &&
       (frame_url.SchemeIs(chrome::kChromeUIScheme) ||
-       frame_url.SchemeIs(chrome::kDataScheme));
+       frame_url.SchemeIs(kDataScheme));
 
   if (!webui_enabled)
     return false;
diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
index 7b39919..53eb7f7 100644
--- a/content/shell/browser/shell_content_browser_client.cc
+++ b/content/shell/browser/shell_content_browser_client.cc
@@ -183,7 +183,7 @@ bool ShellContentBrowserClient::IsHandledURL(const GURL& url) {
       kFileSystemScheme,
       chrome::kChromeUIScheme,
       chrome::kChromeDevToolsScheme,
-      chrome::kDataScheme,
+      kDataScheme,
       kFileScheme,
   };
   for (size_t i = 0; i < arraysize(kProtocolList); ++i) {
diff --git a/content/shell/browser/shell_url_request_context_getter.cc b/content/shell/browser/shell_url_request_context_getter.cc
index 5ec8f23..bd5c937 100644
--- a/content/shell/browser/shell_url_request_context_getter.cc
+++ b/content/shell/browser/shell_url_request_context_getter.cc
@@ -205,8 +205,7 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {
     // ShellContentBrowserClient::IsHandledURL().
     InstallProtocolHandlers(job_factory.get(), &protocol_handlers_);
     bool set_protocol = job_factory->SetProtocolHandler(
-        chrome::kDataScheme,
-        new net::DataProtocolHandler);
+        kDataScheme, new net::DataProtocolHandler);
     DCHECK(set_protocol);
     set_protocol = job_factory->SetProtocolHandler(
         kFileScheme,