content: Move more constants from url_constants.h into content namespace.

BUG=98716
TBR=jam@chromium.org


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

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

6 files changed, 18 insertions, 20 deletions

diff --git a/content/browser/browser_url_handler_impl.cc b/content/browser/browser_url_handler_impl.cc
index 9edfd24..e10e997 100644
--- a/content/browser/browser_url_handler_impl.cc
+++ b/content/browser/browser_url_handler_impl.cc
@@ -62,9 +62,9 @@ static bool ReverseViewSource(GURL* url, BrowserContext* browser_context) {
 
 static bool HandleDebugUrl(GURL* url, BrowserContext* browser_context) {
   // Circumvent processing URLs that the renderer process will handle.
-  return *url == GURL(chrome::kChromeUICrashURL) ||
-         *url == GURL(chrome::kChromeUIHangURL) ||
-         *url == GURL(chrome::kChromeUIKillURL) ||
+  return *url == GURL(kChromeUICrashURL) ||
+         *url == GURL(kChromeUIHangURL) ||
+         *url == GURL(kChromeUIKillURL) ||
          *url == GURL(kChromeUIShorthangURL);
 }
 
diff --git a/content/browser/loader/resource_dispatcher_host_browsertest.cc b/content/browser/loader/resource_dispatcher_host_browsertest.cc
index 6490ee5..282fecc 100644
--- a/content/browser/loader/resource_dispatcher_host_browsertest.cc
+++ b/content/browser/loader/resource_dispatcher_host_browsertest.cc
@@ -274,7 +274,7 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, CrossSiteAfterCrash) {
   WindowedNotificationObserver crash_observer(
       NOTIFICATION_RENDERER_PROCESS_CLOSED,
       NotificationService::AllSources());
-  NavigateToURL(shell(), GURL(chrome::kChromeUICrashURL));
+  NavigateToURL(shell(), GURL(kChromeUICrashURL));
   // Wait for browser to notice the renderer crash.
   crash_observer.Wait();
 
diff --git a/content/browser/site_instance_impl.cc b/content/browser/site_instance_impl.cc
index 14e1651..79cd2c2 100644
--- a/content/browser/site_instance_impl.cc
+++ b/content/browser/site_instance_impl.cc
@@ -29,9 +29,9 @@ static bool IsURLSameAsAnySiteInstance(const GURL& url) {
   if (url.SchemeIs(chrome::kJavaScriptScheme))
     return true;
 
-  return url == GURL(chrome::kChromeUICrashURL) ||
-         url == GURL(chrome::kChromeUIKillURL) ||
-         url == GURL(chrome::kChromeUIHangURL) ||
+  return url == GURL(kChromeUICrashURL) ||
+         url == GURL(kChromeUIKillURL) ||
+         url == GURL(kChromeUIHangURL) ||
          url == GURL(kChromeUIShorthangURL);
 }
 
diff --git a/content/browser/speech/speech_recognition_browsertest.cc b/content/browser/speech/speech_recognition_browsertest.cc
index b09641c..e1efbf1 100644
--- a/content/browser/speech/speech_recognition_browsertest.cc
+++ b/content/browser/speech/speech_recognition_browsertest.cc
@@ -23,10 +23,8 @@
 #include "content/test/content_browser_test_utils.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 
-
 namespace content {
 
-
 class SpeechRecognitionBrowserTest : public ContentBrowserTest {
  public:
   // ContentBrowserTest methods
@@ -130,7 +128,7 @@ IN_PROC_BROWSER_TEST_F(SpeechRecognitionBrowserTest, DISABLED_TestCancelAll) {
 
   // Make the renderer crash. This should trigger
   // InputTagSpeechDispatcherHost to cancel all pending sessions.
-  NavigateToURL(shell(), GURL(chrome::kChromeUICrashURL));
+  NavigateToURL(shell(), GURL(kChromeUICrashURL));
 
   EXPECT_TRUE(fake_speech_recognition_manager_.did_cancel_all());
 }
diff --git a/content/browser/web_contents/debug_urls.cc b/content/browser/web_contents/debug_urls.cc
index 9822274..f62f0b3 100644
--- a/content/browser/web_contents/debug_urls.cc
+++ b/content/browser/web_contents/debug_urls.cc
@@ -21,7 +21,7 @@ namespace {
 
 void HandlePpapiFlashDebugURL(const GURL& url) {
 #if defined(ENABLE_PLUGINS)
-  bool crash = url == GURL(chrome::kChromeUIPpapiFlashCrashURL);
+  bool crash = url == GURL(kChromeUIPpapiFlashCrashURL);
 
   std::vector<PpapiPluginProcessHost*> hosts;
   PpapiPluginProcessHost::FindByName(UTF8ToUTF16(kFlashPluginName), &hosts);
@@ -48,29 +48,29 @@ bool HandleDebugURL(const GURL& url, PageTransition transition) {
     return true;
   }
 
-  if (url == GURL(chrome::kChromeUIGpuCleanURL)) {
+  if (url == GURL(kChromeUIGpuCleanURL)) {
     GpuProcessHostUIShim* shim = GpuProcessHostUIShim::GetOneInstance();
     if (shim)
       shim->SimulateRemoveAllContext();
     return true;
   }
 
-  if (url == GURL(chrome::kChromeUIGpuCrashURL)) {
+  if (url == GURL(kChromeUIGpuCrashURL)) {
     GpuProcessHostUIShim* shim = GpuProcessHostUIShim::GetOneInstance();
     if (shim)
       shim->SimulateCrash();
     return true;
   }
 
-  if (url == GURL(chrome::kChromeUIGpuHangURL)) {
+  if (url == GURL(kChromeUIGpuHangURL)) {
     GpuProcessHostUIShim* shim = GpuProcessHostUIShim::GetOneInstance();
     if (shim)
       shim->SimulateHang();
     return true;
   }
 
-  if (url == GURL(chrome::kChromeUIPpapiFlashCrashURL) ||
-      url == GURL(chrome::kChromeUIPpapiFlashHangURL)) {
+  if (url == GURL(kChromeUIPpapiFlashCrashURL) ||
+      url == GURL(kChromeUIPpapiFlashHangURL)) {
     BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                             base::Bind(&HandlePpapiFlashDebugURL, url));
     return true;
diff --git a/content/browser/webui/web_ui_controller_factory_registry.cc b/content/browser/webui/web_ui_controller_factory_registry.cc
index 7040a56..5e7bd63 100644
--- a/content/browser/webui/web_ui_controller_factory_registry.cc
+++ b/content/browser/webui/web_ui_controller_factory_registry.cc
@@ -87,10 +87,10 @@ bool WebUIControllerFactoryRegistry::IsURLAcceptableForWebUI(
       // See http://crbug.com/42547
       url.spec() == chrome::kAboutBlankURL ||
       // Chrome URLs crash, kill, hang, and shorthang are allowed.
-      url == GURL(chrome::kChromeUICrashURL) ||
-      url == GURL(chrome::kChromeUIKillURL) ||
-      url == GURL(chrome::kChromeUIHangURL) ||
-      url == GURL(content::kChromeUIShorthangURL) ||
+      url == GURL(kChromeUICrashURL) ||
+      url == GURL(kChromeUIKillURL) ||
+      url == GURL(kChromeUIHangURL) ||
+      url == GURL(kChromeUIShorthangURL) ||
       // Data URLs are usually not allowed in WebUI for security reasons.
       // BalloonHosts are one exception needed by ChromeOS, and are safe because
       // they cannot be scripted by other pages.