content: Move kViewSourceScheme constant into content namespace.

BUG=None
R=thestig@chromium.org,grt@chromium.org,joi@chromium.org,eroman@chromium.org

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

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

6 files changed, 17 insertions, 17 deletions

diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
index b5dc24d..3579b2b 100644
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -71,7 +71,7 @@ bool HasInternalURL(const NavigationEntry* entry) {
 
   // If the |virtual_url()| isn't a chrome:// URL, check if it's actually
   // view-source: of a chrome:// URL.
-  if (entry->GetVirtualURL().SchemeIs(chrome::kViewSourceScheme))
+  if (entry->GetVirtualURL().SchemeIs(content::kViewSourceScheme))
     return entry->GetURL().SchemeIs(chrome::kChromeUIScheme);
 
   return false;
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index fd1c0ad..ee92200 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -1014,8 +1014,8 @@ void ViewSource(Browser* browser,
   if (!active_entry)
     return;
 
-  GURL view_source_url = GURL(kViewSourceScheme + std::string(":") +
-      url.spec());
+  GURL view_source_url =
+      GURL(content::kViewSourceScheme + std::string(":") + url.spec());
   active_entry->SetVirtualURL(view_source_url);
 
   // Do not restore scroller position.
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index d9ed0d3..4c6b399 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -640,13 +640,13 @@ void Navigate(NavigateParams* params) {
 
 bool IsURLAllowedInIncognito(const GURL& url,
                              content::BrowserContext* browser_context) {
-  if (url.scheme() == chrome::kViewSourceScheme) {
+  if (url.scheme() == content::kViewSourceScheme) {
     // A view-source URL is allowed in incognito mode only if the URL itself
     // is allowed in incognito mode. Remove the "view-source:" from the start
     // of the URL and validate the rest.
     std::string stripped_spec = url.spec();
-    DCHECK_GT(stripped_spec.size(), strlen(kViewSourceScheme));
-    stripped_spec.erase(0, strlen(kViewSourceScheme)+1);
+    DCHECK_GT(stripped_spec.size(), strlen(content::kViewSourceScheme));
+    stripped_spec.erase(0, strlen(content::kViewSourceScheme) + 1);
     GURL stripped_url(stripped_spec);
     return stripped_url.is_valid() &&
         IsURLAllowedInIncognito(stripped_url, browser_context);
diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc
index 588b09e..6d8ddcc 100644
--- a/chrome/browser/ui/browser_navigator_browsertest.cc
+++ b/chrome/browser/ui/browser_navigator_browsertest.cc
@@ -926,7 +926,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
 IN_PROC_BROWSER_TEST_F(
     BrowserNavigatorTest,
     Disposition_ViewSource_Settings_DoNothingIfIncognitoForced) {
-  std::string view_source(chrome::kViewSourceScheme);
+  std::string view_source(content::kViewSourceScheme);
   view_source.append(":");
   view_source.append(chrome::kChromeUISettingsURL);
   RunDoNothingIfIncognitoIsForcedTest(GURL(view_source));
@@ -937,7 +937,7 @@ IN_PROC_BROWSER_TEST_F(
 // case).
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        Disposition_ViewSource_Settings_UseNonIncognitoWindow) {
-  std::string view_source(chrome::kViewSourceScheme);
+  std::string view_source(content::kViewSourceScheme);
   view_source.append(":");
   view_source.append(chrome::kChromeUISettingsURL);
   RunUseNonIncognitoWindowTest(GURL(view_source));
@@ -1290,7 +1290,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
 
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, ViewSourceIsntSingleton) {
   const std::string viewsource_ntp_url =
-      std::string(chrome::kViewSourceScheme) + ":" +
+      std::string(content::kViewSourceScheme) + ":" +
       chrome::kChromeUIVersionURL;
 
   chrome::NavigateParams viewsource_params(browser(),
diff --git a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm
index 0219701..7fc426f 100644
--- a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm
+++ b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm
@@ -304,13 +304,13 @@ void ResumeAppleEventAndSendReply(NSAppleEventManagerSuspensionID suspension_id,
   NavigationEntry* entry =
       webContents_->GetController().GetLastCommittedEntry();
   if (entry) {
-    webContents_->OpenURL(OpenURLParams(
-        GURL(chrome::kViewSourceScheme + std::string(":") +
-             entry->GetURL().spec()),
-        Referrer(),
-        NEW_FOREGROUND_TAB,
-        content::PAGE_TRANSITION_LINK,
-        false));
+    webContents_->OpenURL(
+        OpenURLParams(GURL(content::kViewSourceScheme + std::string(":") +
+                           entry->GetURL().spec()),
+                      Referrer(),
+                      NEW_FOREGROUND_TAB,
+                      content::PAGE_TRANSITION_LINK,
+                      false));
   }
 }
 
diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_tabs.cc
index 6515cbe..10648de 100644
--- a/chrome/browser/ui/singleton_tabs.cc
+++ b/chrome/browser/ui/singleton_tabs.cc
@@ -97,7 +97,7 @@ int GetIndexOfSingletonTab(NavigateParams* params) {
 
     // Skip view-source tabs. This is needed because RewriteURLIfNecessary
     // removes the "view-source:" scheme which leads to incorrect matching.
-    if (tab_url.SchemeIs(chrome::kViewSourceScheme))
+    if (tab_url.SchemeIs(content::kViewSourceScheme))
       continue;
 
     GURL rewritten_tab_url = tab_url;