Index: chrome/browser/unload_browsertest.cc |
diff --git a/chrome/browser/unload_browsertest.cc b/chrome/browser/unload_browsertest.cc |
index 4276730238cbe00662b14df42f516f2cc19efdeb..0a85e6afdbe433e5ad134319c0f4114d4dd4775f 100644 |
--- a/chrome/browser/unload_browsertest.cc |
+++ b/chrome/browser/unload_browsertest.cc |
@@ -113,7 +113,7 @@ const std::string CLOSE_TAB_WHEN_OTHER_TAB_HAS_LISTENER = |
class UnloadTest : public InProcessBrowserTest { |
public: |
- void SetUpCommandLine(CommandLine* command_line) override { |
+ void SetUpCommandLine(base::CommandLine* command_line) override { |
const testing::TestInfo* const test_info = |
testing::UnitTest::GetInstance()->current_test_info(); |
if (strcmp(test_info->name(), |
@@ -196,7 +196,8 @@ class UnloadTest : public InProcessBrowserTest { |
// This test is flaky on the valgrind UI bots. http://crbug.com/39057 |
IN_PROC_BROWSER_TEST_F(UnloadTest, CrossSiteInfiniteUnloadAsync) { |
// Tests makes no sense in single-process mode since the renderer is hung. |
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) |
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kSingleProcess)) |
return; |
NavigateToDataURL(INFINITE_UNLOAD_HTML, "infiniteunload"); |
@@ -209,7 +210,8 @@ IN_PROC_BROWSER_TEST_F(UnloadTest, CrossSiteInfiniteUnloadAsync) { |
// we correctly nav to each one. |
IN_PROC_BROWSER_TEST_F(UnloadTest, CrossSiteInfiniteUnloadSync) { |
// Tests makes no sense in single-process mode since the renderer is hung. |
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) |
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kSingleProcess)) |
return; |
NavigateToDataURL(INFINITE_UNLOAD_HTML, "infiniteunload"); |
@@ -224,7 +226,8 @@ IN_PROC_BROWSER_TEST_F(UnloadTest, CrossSiteInfiniteUnloadSync) { |
// http://crbug.com/86469 |
IN_PROC_BROWSER_TEST_F(UnloadTest, CrossSiteInfiniteBeforeUnloadAsync) { |
// Tests makes no sense in single-process mode since the renderer is hung. |
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) |
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kSingleProcess)) |
return; |
NavigateToDataURL(INFINITE_BEFORE_UNLOAD_HTML, "infinitebeforeunload"); |
@@ -238,7 +241,8 @@ IN_PROC_BROWSER_TEST_F(UnloadTest, CrossSiteInfiniteBeforeUnloadAsync) { |
// If this flakes, see bug http://crbug.com/86469. |
IN_PROC_BROWSER_TEST_F(UnloadTest, CrossSiteInfiniteBeforeUnloadSync) { |
// Tests makes no sense in single-process mode since the renderer is hung. |
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) |
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kSingleProcess)) |
return; |
NavigateToDataURL(INFINITE_BEFORE_UNLOAD_HTML, "infinitebeforeunload"); |
@@ -329,7 +333,8 @@ IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseTwoSecondBeforeUnload) { |
// the unload handler has an infinite loop. |
IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseInfiniteUnload) { |
// Tests makes no sense in single-process mode since the renderer is hung. |
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) |
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kSingleProcess)) |
return; |
LoadUrlAndQuitBrowser(INFINITE_UNLOAD_HTML, "infiniteunload"); |
@@ -339,7 +344,8 @@ IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseInfiniteUnload) { |
// If this flakes, use http://crbug.com/78803 and http://crbug.com/86469 |
IN_PROC_BROWSER_TEST_F(UnloadTest, DISABLED_BrowserCloseInfiniteBeforeUnload) { |
// Tests makes no sense in single-process mode since the renderer is hung. |
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) |
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kSingleProcess)) |
return; |
LoadUrlAndQuitBrowser(INFINITE_BEFORE_UNLOAD_HTML, "infinitebeforeunload"); |
@@ -350,7 +356,8 @@ IN_PROC_BROWSER_TEST_F(UnloadTest, DISABLED_BrowserCloseInfiniteBeforeUnload) { |
// If this flakes, use http://crbug.com/86469 |
IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseInfiniteUnloadAlert) { |
// Tests makes no sense in single-process mode since the renderer is hung. |
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) |
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kSingleProcess)) |
return; |
LoadUrlAndQuitBrowser(INFINITE_UNLOAD_ALERT_HTML, "infiniteunloadalert"); |
@@ -362,7 +369,8 @@ IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseInfiniteUnloadAlert) { |
IN_PROC_BROWSER_TEST_F(UnloadTest, |
DISABLED_BrowserCloseInfiniteBeforeUnloadAlert) { |
// Tests makes no sense in single-process mode since the renderer is hung. |
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) |
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kSingleProcess)) |
return; |
LoadUrlAndQuitBrowser(INFINITE_BEFORE_UNLOAD_ALERT_HTML, |
@@ -416,7 +424,7 @@ IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseTabWhenOtherTabHasListener) { |
class FastUnloadTest : public UnloadTest { |
public: |
- void SetUpCommandLine(CommandLine* command_line) override { |
+ void SetUpCommandLine(base::CommandLine* command_line) override { |
UnloadTest::SetUpCommandLine(command_line); |
command_line->AppendSwitch(switches::kEnableFastUnload); |
} |
@@ -620,7 +628,8 @@ IN_PROC_BROWSER_TEST_F(FastUnloadTest, DISABLED_WindowCloseAfterUnloadCrash) { |
IN_PROC_BROWSER_TEST_F(FastUnloadTest, |
MAYBE_WindowCloseAfterBeforeUnloadCrash) { |
// Tests makes no sense in single-process mode since the renderer is hung. |
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) |
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kSingleProcess)) |
return; |
NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload"); |