Index: chrome/browser/ui/browser_browsertest.cc |
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc |
index b9e9926c82dcb55a9e1a06d466132ad57fd171fd..93cb13ffd1a659932bdce9ee52a8c6ca43eae07b 100644 |
--- a/chrome/browser/ui/browser_browsertest.cc |
+++ b/chrome/browser/ui/browser_browsertest.cc |
@@ -356,7 +356,8 @@ class BrowserTest : public ExtensionBrowserTest { |
IN_PROC_BROWSER_TEST_F(BrowserTest, NoTitle) { |
#if defined(OS_WIN) && defined(USE_ASH) |
// Disable this test in Metro+Ash for now (http://crbug.com/262796). |
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kAshBrowserTests)) |
return; |
#endif |
@@ -376,7 +377,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, NoTitle) { |
IN_PROC_BROWSER_TEST_F(BrowserTest, Title) { |
#if defined(OS_WIN) && defined(USE_ASH) |
// Disable this test in Metro+Ash for now (http://crbug.com/262796). |
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kAshBrowserTests)) |
return; |
#endif |
@@ -898,7 +900,7 @@ IN_PROC_BROWSER_TEST_F(BeforeUnloadAtQuitWithTwoWindows, |
// it to a cross-site URL. It should also work for meta-refreshes. |
// See http://crbug.com/93517. |
IN_PROC_BROWSER_TEST_F(BrowserTest, NullOpenerRedirectForksProcess) { |
- CommandLine::ForCurrentProcess()->AppendSwitch( |
+ base::CommandLine::ForCurrentProcess()->AppendSwitch( |
switches::kDisablePopupBlocking); |
// Create http and https servers for a cross-site transition. |
@@ -987,7 +989,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, NullOpenerRedirectForksProcess) { |
// http://www.google.com/chrome/intl/en/webmasters-faq.html#newtab will not |
// fork a new renderer process. |
IN_PROC_BROWSER_TEST_F(BrowserTest, OtherRedirectsDontForkProcess) { |
- CommandLine::ForCurrentProcess()->AppendSwitch( |
+ base::CommandLine::ForCurrentProcess()->AppendSwitch( |
switches::kDisablePopupBlocking); |
// Create http and https servers for a cross-site transition. |
@@ -1307,7 +1309,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, AppIdSwitch) { |
ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); |
const Extension* extension_app = GetExtension(); |
- CommandLine command_line(CommandLine::NO_PROGRAM); |
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM); |
command_line.AppendSwitchASCII(switches::kAppId, extension_app->id()); |
chrome::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ? |
@@ -1541,7 +1543,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { |
PinnedTabCodec::WritePinnedTabs(browser()->profile()); |
// Simulate launching again. |
- CommandLine dummy(CommandLine::NO_PROGRAM); |
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM); |
chrome::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ? |
chrome::startup::IS_FIRST_RUN : chrome::startup::IS_NOT_FIRST_RUN; |
StartupBrowserCreatorImpl launch(base::FilePath(), dummy, first_run); |
@@ -2141,7 +2143,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest2, NoTabsInPopups) { |
#endif |
IN_PROC_BROWSER_TEST_F(BrowserTest, WindowOpenClose) { |
- CommandLine::ForCurrentProcess()->AppendSwitch( |
+ base::CommandLine::ForCurrentProcess()->AppendSwitch( |
switches::kDisablePopupBlocking); |
GURL url = ui_test_utils::GetTestUrl( |
base::FilePath(), base::FilePath().AppendASCII("window.close.html")); |
@@ -2160,7 +2162,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, WindowOpenClose) { |
IN_PROC_BROWSER_TEST_F(BrowserTest, FullscreenBookmarkBar) { |
#if defined(OS_WIN) && defined(USE_ASH) |
// Disable this test in Metro+Ash for now (http://crbug.com/262796). |
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kAshBrowserTests)) |
return; |
#endif |
@@ -2197,7 +2200,7 @@ class KioskModeTest : public BrowserTest { |
public: |
KioskModeTest() {} |
- void SetUpCommandLine(CommandLine* command_line) override { |
+ void SetUpCommandLine(base::CommandLine* command_line) override { |
command_line->AppendSwitch(switches::kKioskMode); |
} |
}; |
@@ -2222,7 +2225,7 @@ class LaunchBrowserWithNonAsciiUserDatadir : public BrowserTest { |
public: |
LaunchBrowserWithNonAsciiUserDatadir() {} |
- virtual void SetUpCommandLine(CommandLine* command_line) override { |
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override { |
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); |
base::FilePath tmp_profile = temp_dir_.path().AppendASCII("tmp_profile"); |
tmp_profile = tmp_profile.Append(L"Test Chrome G\u00E9raldine"); |
@@ -2247,7 +2250,7 @@ class RunInBackgroundTest : public BrowserTest { |
public: |
RunInBackgroundTest() {} |
- void SetUpCommandLine(CommandLine* command_line) override { |
+ void SetUpCommandLine(base::CommandLine* command_line) override { |
command_line->AppendSwitch(switches::kKeepAliveForTest); |
} |
}; |
@@ -2277,7 +2280,7 @@ class NoStartupWindowTest : public BrowserTest { |
public: |
NoStartupWindowTest() {} |
- void SetUpCommandLine(CommandLine* command_line) override { |
+ void SetUpCommandLine(base::CommandLine* command_line) override { |
command_line->AppendSwitch(switches::kNoStartupWindow); |
command_line->AppendSwitch(switches::kKeepAliveForTest); |
} |
@@ -2293,7 +2296,8 @@ class NoStartupWindowTest : public BrowserTest { |
IN_PROC_BROWSER_TEST_F(NoStartupWindowTest, NoStartupWindowBasicTest) { |
#if defined(OS_WIN) && defined(USE_ASH) |
// kNoStartupWindow doesn't make sense in Metro+Ash. |
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kAshBrowserTests)) |
return; |
#endif |
@@ -2314,7 +2318,8 @@ IN_PROC_BROWSER_TEST_F(NoStartupWindowTest, NoStartupWindowBasicTest) { |
IN_PROC_BROWSER_TEST_F(NoStartupWindowTest, DontInitSessionServiceForApps) { |
#if defined(OS_WIN) && defined(USE_ASH) |
// kNoStartupWindow doesn't make sense in Metro+Ash. |
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kAshBrowserTests)) |
return; |
#endif |
@@ -2340,7 +2345,7 @@ class AppModeTest : public BrowserTest { |
public: |
AppModeTest() {} |
- void SetUpCommandLine(CommandLine* command_line) override { |
+ void SetUpCommandLine(base::CommandLine* command_line) override { |
GURL url = ui_test_utils::GetTestUrl( |
base::FilePath(), base::FilePath().AppendASCII("title1.html")); |
command_line->AppendSwitchASCII(switches::kApp, url.spec()); |
@@ -2350,7 +2355,8 @@ class AppModeTest : public BrowserTest { |
IN_PROC_BROWSER_TEST_F(AppModeTest, EnableAppModeTest) { |
#if defined(OS_WIN) && defined(USE_ASH) |
// Disable this test in Metro+Ash for now (http://crbug.com/262796). |
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kAshBrowserTests)) |
return; |
#endif |