summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/automation/automation_tab_helper_browsertest.cc2
-rw-r--r--chrome/browser/crash_recovery_browsertest.cc2
-rw-r--r--chrome/browser/extensions/api/management/management_api_browsertest.cc2
-rw-r--r--chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc2
-rw-r--r--chrome/browser/instant/instant_browsertest.cc6
-rw-r--r--chrome/browser/logging_chrome_browsertest.cc2
-rw-r--r--chrome/browser/metrics/metrics_service_browsertest.cc2
-rw-r--r--chrome/browser/performance_monitor/performance_monitor_browsertest.cc2
-rw-r--r--chrome/browser/prerender/prerender_browsertest.cc4
-rw-r--r--chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc6
10 files changed, 15 insertions, 15 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(
generated by cgit v1.1 at 2025-01-28 22:02:19 +0000