diff options
23 files changed, 55 insertions, 57 deletions
diff --git a/chrome/browser/automation/automation_tab_helper_browsertest.cc b/chrome/browser/automation/automation_tab_helper_browsertest.cc index ec27758..44f6247 100644 --- a/chrome/browser/automation/automation_tab_helper_browsertest.cc +++ b/chrome/browser/automation/automation_tab_helper_browsertest.cc @@ -211,5 +211,5 @@ IN_PROC_BROWSER_TEST_F(AutomationTabHelperBrowserTest, EXPECT_CALL(mock_tab_observer, OnFirstPendingLoad(_)); EXPECT_CALL(mock_tab_observer, OnNoMorePendingLoads(_)); - ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUICrashURL)); + ui_test_utils::NavigateToURL(browser(), GURL(content::kChromeUICrashURL)); } diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc index 373ee85..015570c 100644 --- a/chrome/browser/crash_recovery_browsertest.cc +++ b/chrome/browser/crash_recovery_browsertest.cc @@ -26,7 +26,7 @@ void SimulateRendererCrash(Browser* browser) { content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED, content::NotificationService::AllSources()); browser->OpenURL(OpenURLParams( - GURL(chrome::kChromeUICrashURL), Referrer(), CURRENT_TAB, + GURL(content::kChromeUICrashURL), Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false)); observer.Wait(); } diff --git a/chrome/browser/extensions/api/management/management_api_browsertest.cc b/chrome/browser/extensions/api/management/management_api_browsertest.cc index f4462ff..f475e81 100644 --- a/chrome/browser/extensions/api/management/management_api_browsertest.cc +++ b/chrome/browser/extensions/api/management/management_api_browsertest.cc @@ -39,7 +39,7 @@ class ExtensionManagementApiBrowserTest : public ExtensionBrowserTest { if (!background_host) return false; background_host->host_contents()->GetController().LoadURL( - GURL(chrome::kChromeUICrashURL), content::Referrer(), + GURL(content::kChromeUICrashURL), content::Referrer(), content::PAGE_TRANSITION_LINK, std::string()); extension_crash_observer.Wait(); return true; diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc index 86203b5..9bf0839 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc @@ -713,7 +713,7 @@ IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, Crash) { test_server()->host_port_pair().port())); ui_test_utils::NavigateToURL(browser(), url); - ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUICrashURL)); + ui_test_utils::NavigateToURL(browser(), GURL(content::kChromeUICrashURL)); url = GURL(base::StringPrintf( "http://www.a.com:%d/" diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/instant/instant_browsertest.cc index d5cb8c8..c149544 100644 --- a/chrome/browser/instant/instant_browsertest.cc +++ b/chrome/browser/instant/instant_browsertest.cc @@ -403,15 +403,15 @@ IN_PROC_BROWSER_TEST_F(InstantTest, RejectsURLs) { // Note that we are not actually navigating to these URLs yet. We are just // typing them into the omnibox (without pressing Enter) and checking that // Instant doesn't try to process them. - SetOmniboxText(chrome::kChromeUICrashURL); + SetOmniboxText(content::kChromeUICrashURL); EXPECT_FALSE(instant()->IsPreviewingSearchResults()); EXPECT_TRUE(instant()->model()->mode().is_default()); - SetOmniboxText(chrome::kChromeUIHangURL); + SetOmniboxText(content::kChromeUIHangURL); EXPECT_FALSE(instant()->IsPreviewingSearchResults()); EXPECT_TRUE(instant()->model()->mode().is_default()); - SetOmniboxText(chrome::kChromeUIKillURL); + SetOmniboxText(content::kChromeUIKillURL); EXPECT_FALSE(instant()->IsPreviewingSearchResults()); EXPECT_TRUE(instant()->model()->mode().is_default()); diff --git a/chrome/browser/logging_chrome_browsertest.cc b/chrome/browser/logging_chrome_browsertest.cc index 4240c06..9728fd3 100644 --- a/chrome/browser/logging_chrome_browsertest.cc +++ b/chrome/browser/logging_chrome_browsertest.cc @@ -94,7 +94,7 @@ IN_PROC_BROWSER_TEST_F(RendererCrashTest, DISABLED_Crash) { registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED, content::NotificationService::AllSources()); ui_test_utils::NavigateToURLWithDisposition( - browser(), GURL(chrome::kChromeUICrashURL), CURRENT_TAB, 0); + browser(), GURL(content::kChromeUICrashURL), CURRENT_TAB, 0); content::RunMessageLoop(); ASSERT_TRUE(saw_crash_); } diff --git a/chrome/browser/metrics/metrics_service_browsertest.cc b/chrome/browser/metrics/metrics_service_browsertest.cc index 29df04f..8f5d20d 100644 --- a/chrome/browser/metrics/metrics_service_browsertest.cc +++ b/chrome/browser/metrics/metrics_service_browsertest.cc @@ -91,7 +91,7 @@ IN_PROC_BROWSER_TEST_F(MetricsServiceTest, MAYBE_CrashRenderers) { content::WindowedNotificationObserver observer( content::NOTIFICATION_RENDERER_PROCESS_CLOSED, content::NotificationService::AllSources()); - ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUICrashURL)); + ui_test_utils::NavigateToURL(browser(), GURL(content::kChromeUICrashURL)); observer.Wait(); // The MetricsService listens for the same notification, so the |observer| diff --git a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc index 5318242..9382169 100644 --- a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc +++ b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc @@ -623,7 +623,7 @@ IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, RendererCrashEvent) { content::NOTIFICATION_RENDERER_PROCESS_CLOSED, content::NotificationService::AllSources()); - ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUICrashURL)); + ui_test_utils::NavigateToURL(browser(), GURL(content::kChromeUICrashURL)); windowed_observer.Wait(); diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index 7e21adf..5c32050 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -289,7 +289,7 @@ class TestPrerenderContents : public PrerenderContents { virtual bool AddAliasURL(const GURL& url) OVERRIDE { // Prevent FINAL_STATUS_UNSUPPORTED_SCHEME when navigating to about:crash in // the PrerenderRendererCrash test. - if (url.spec() != chrome::kChromeUICrashURL) + if (url.spec() != content::kChromeUICrashURL) return PrerenderContents::AddAliasURL(url); return true; } @@ -1965,7 +1965,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_PrerenderRendererCrash) { ASSERT_TRUE(GetPrerenderContents()->prerender_contents()); GetPrerenderContents()->prerender_contents()->GetController(). LoadURL( - GURL(chrome::kChromeUICrashURL), + GURL(content::kChromeUICrashURL), content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string()); diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc index 2534b55..3b571c9 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc @@ -120,13 +120,13 @@ IN_PROC_BROWSER_TEST_F(NewTabUIBrowserTest, ChromeHangInNTP) { // Navigate to chrome://hang/ to stall the process. ui_test_utils::NavigateToURLWithDisposition( - browser(), GURL(chrome::kChromeUIHangURL), CURRENT_TAB, 0); + browser(), GURL(content::kChromeUIHangURL), CURRENT_TAB, 0); // Visit chrome://hang/ again in another NTP. Don't bother waiting for the // NTP to load, because it's hung. chrome::NewTab(browser()); browser()->OpenURL(OpenURLParams( - GURL(chrome::kChromeUIHangURL), Referrer(), CURRENT_TAB, + GURL(content::kChromeUIHangURL), Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false)); } @@ -149,7 +149,7 @@ IN_PROC_BROWSER_TEST_F(NewTabUIProcessPerTabTest, NavBeforeNTPCommits) { // Navigate to chrome://hang/ to stall the process. ui_test_utils::NavigateToURLWithDisposition( - browser(), GURL(chrome::kChromeUIHangURL), CURRENT_TAB, 0); + browser(), GURL(content::kChromeUIHangURL), CURRENT_TAB, 0); // Visit a normal URL in another NTP that hasn't committed. ui_test_utils::NavigateToURLWithDisposition( diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc index 2341c08..1db3b32 100644 --- a/chrome/common/url_constants.cc +++ b/chrome/common/url_constants.cc @@ -502,15 +502,15 @@ const char kLearnMoreEnterpriseURL[] = #endif const char* const kChromeDebugURLs[] = { - kChromeUICrashURL, - kChromeUIKillURL, - kChromeUIHangURL, + content::kChromeUICrashURL, + content::kChromeUIKillURL, + content::kChromeUIHangURL, content::kChromeUIShorthangURL, - kChromeUIGpuCleanURL, - kChromeUIGpuCrashURL, - kChromeUIGpuHangURL, - kChromeUIPpapiFlashCrashURL, - kChromeUIPpapiFlashHangURL + content::kChromeUIGpuCleanURL, + content::kChromeUIGpuCrashURL, + content::kChromeUIGpuHangURL, + content::kChromeUIPpapiFlashCrashURL, + content::kChromeUIPpapiFlashHangURL }; const int kNumberOfChromeDebugURLs = static_cast<int>(arraysize(kChromeDebugURLs)); diff --git a/chrome/test/gpu/webgl_infobar_browsertest.cc b/chrome/test/gpu/webgl_infobar_browsertest.cc index b98511c..1ef4995 100644 --- a/chrome/test/gpu/webgl_infobar_browsertest.cc +++ b/chrome/test/gpu/webgl_infobar_browsertest.cc @@ -38,7 +38,7 @@ void SimulateGPUCrash(Browser* browser) { // constraints, so we use chrome::Navigate directly. chrome::NavigateParams params( browser, - GURL(chrome::kChromeUIGpuCrashURL), + GURL(content::kChromeUIGpuCrashURL), static_cast<content::PageTransition>( content::PAGE_TRANSITION_TYPED | content::PAGE_TRANSITION_FROM_ADDRESS_BAR)); diff --git a/chrome/test/reliability/automated_ui_tests.cc b/chrome/test/reliability/automated_ui_tests.cc index 1cee9ae8..22266c4 100644 --- a/chrome/test/reliability/automated_ui_tests.cc +++ b/chrome/test/reliability/automated_ui_tests.cc @@ -662,7 +662,7 @@ bool AutomatedUITest::FuzzyTestDialog(int num_actions) { bool AutomatedUITest::ForceCrash() { scoped_refptr<TabProxy> tab(GetActiveTab()); - GURL test_url(chrome::kChromeUICrashURL); + GURL test_url(content::kChromeUICrashURL); AutomationMsg_NavigationResponseValues result = tab->NavigateToURL(test_url); if (result != AUTOMATION_MSG_NAVIGATION_SUCCESS) { AddErrorAttribute("navigation_failed"); diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc index 18d78e3..f46ba67 100644 --- a/chrome/test/reliability/page_load_test.cc +++ b/chrome/test/reliability/page_load_test.cc @@ -517,7 +517,7 @@ class PageLoadTest : public UITest { EXPECT_EQ(0, metrics.plugin_crash_count); // Go to "about:crash" - NavigateToURLLogResult(chrome::kChromeUICrashURL, + NavigateToURLLogResult(content::kChromeUICrashURL, log_file, &metrics, g_continuous_load, 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. diff --git a/content/public/common/url_constants.cc b/content/public/common/url_constants.cc index fbeaf19..057545c 100644 --- a/content/public/common/url_constants.cc +++ b/content/public/common/url_constants.cc @@ -45,6 +45,10 @@ const char kChromeUITcmallocHost[] = "tcmalloc"; const char kChromeUITracingHost[] = "tracing"; const char kChromeUIWebRTCInternalsHost[] = "webrtc-internals"; +} // namespace chrome + +namespace content { + const char kChromeUICrashURL[] = "chrome://crash"; const char kChromeUIGpuCleanURL[] = "chrome://gpuclean"; const char kChromeUIGpuCrashURL[] = "chrome://gpucrash"; @@ -54,10 +58,6 @@ const char kChromeUIKillURL[] = "chrome://kill"; const char kChromeUIPpapiFlashCrashURL[] = "chrome://ppapiflashcrash"; const char kChromeUIPpapiFlashHangURL[] = "chrome://ppapiflashhang"; -} // namespace chrome - -namespace content { - const char kStandardSchemeSeparator[] = "://"; // This error URL is loaded in normal web renderer processes, so it should not diff --git a/content/public/common/url_constants.h b/content/public/common/url_constants.h index 8961b20..ece09e65 100644 --- a/content/public/common/url_constants.h +++ b/content/public/common/url_constants.h @@ -51,6 +51,10 @@ CONTENT_EXPORT extern const char kChromeUITcmallocHost[]; CONTENT_EXPORT extern const char kChromeUITracingHost[]; CONTENT_EXPORT extern const char kChromeUIWebRTCInternalsHost[]; +} // namespace chrome + +namespace content { + // Full about URLs (including schemes). CONTENT_EXPORT extern const char kChromeUICrashURL[]; CONTENT_EXPORT extern const char kChromeUIGpuCleanURL[]; @@ -61,10 +65,6 @@ CONTENT_EXPORT extern const char kChromeUIKillURL[]; CONTENT_EXPORT extern const char kChromeUIPpapiFlashCrashURL[]; CONTENT_EXPORT extern const char kChromeUIPpapiFlashHangURL[]; -} // namespace chrome - -namespace content { - // Used to separate a standard scheme and the hostname: "://". CONTENT_EXPORT extern const char kStandardSchemeSeparator[]; diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 070baed..dcd48e6 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -444,11 +444,11 @@ NOINLINE static void CrashIntentionally() { static void MaybeHandleDebugURL(const GURL& url) { if (!url.SchemeIs(chrome::kChromeUIScheme)) return; - if (url == GURL(chrome::kChromeUICrashURL)) { + if (url == GURL(kChromeUICrashURL)) { CrashIntentionally(); - } else if (url == GURL(chrome::kChromeUIKillURL)) { + } else if (url == GURL(kChromeUIKillURL)) { base::KillProcess(base::GetCurrentProcessHandle(), 1, false); - } else if (url == GURL(chrome::kChromeUIHangURL)) { + } else if (url == GURL(kChromeUIHangURL)) { for (;;) { base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1)); } |