Index: chrome/browser/policy/policy_browsertest.cc |
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc |
index 845b28a4543795723d8148bbc87e5ffb154becc9..400fb87ecd2d32530b3689901a2582d6e109e927 100644 |
--- a/chrome/browser/policy/policy_browsertest.cc |
+++ b/chrome/browser/policy/policy_browsertest.cc |
@@ -614,7 +614,7 @@ class PolicyTest : public InProcessBrowserTest { |
} |
void SetUpInProcessBrowserTestFixture() override { |
- CommandLine::ForCurrentProcess()->AppendSwitch("noerrdialogs"); |
+ base::CommandLine::ForCurrentProcess()->AppendSwitch("noerrdialogs"); |
EXPECT_CALL(provider_, IsInitializationComplete(_)) |
.WillRepeatedly(Return(true)); |
BrowserPolicyConnector::SetPolicyProviderForTesting(&provider_); |
@@ -840,7 +840,8 @@ IN_PROC_BROWSER_TEST_F(LocalePolicyTest, ApplicationLocaleValue) { |
IN_PROC_BROWSER_TEST_F(PolicyTest, BookmarkBarEnabled) { |
#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 |
@@ -1498,7 +1499,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DeveloperToolsDisabled) { |
IN_PROC_BROWSER_TEST_F(PolicyTest, DISABLED_WebStoreIconHidden) { |
#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 |
@@ -1641,7 +1643,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionInstallBlacklistSharedModules) { |
.AppendASCII("policy_shared_module") |
.AppendASCII("update.xml"); |
GURL update_xml_url(URLRequestMockHTTPJob::GetMockUrl(update_xml_path)); |
- CommandLine::ForCurrentProcess()->AppendSwitchASCII( |
+ base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( |
switches::kAppsGalleryUpdateURL, update_xml_url.spec()); |
ui_test_utils::NavigateToURL(browser(), update_xml_url); |
@@ -2154,7 +2156,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionMinimumVersionForceInstalled) { |
IN_PROC_BROWSER_TEST_F(PolicyTest, HomepageLocation) { |
#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 |
@@ -3047,7 +3050,7 @@ static const char* kRestoredURLs[] = { |
"http://bbb.com/empty.html", |
}; |
-bool IsNonSwitchArgument(const CommandLine::StringType& s) { |
+bool IsNonSwitchArgument(const base::CommandLine::StringType& s) { |
return s.empty() || s[0] != '-'; |
} |
@@ -3065,7 +3068,7 @@ class RestoreOnStartupPolicyTest |
virtual ~RestoreOnStartupPolicyTest() {} |
#if defined(OS_CHROMEOS) |
- virtual void SetUpCommandLine(CommandLine* command_line) override { |
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override { |
// TODO(nkostylev): Investigate if we can remove this switch. |
command_line->AppendSwitch(switches::kCreateBrowserOnStartupForTests); |
PolicyTest::SetUpCommandLine(command_line); |
@@ -3079,8 +3082,8 @@ class RestoreOnStartupPolicyTest |
// Remove the non-switch arguments, so that session restore kicks in for |
// these tests. |
- CommandLine* command_line = CommandLine::ForCurrentProcess(); |
- CommandLine::StringVector argv = command_line->argv(); |
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
+ base::CommandLine::StringVector argv = command_line->argv(); |
argv.erase(std::remove_if(++argv.begin(), argv.end(), IsNonSwitchArgument), |
argv.end()); |
command_line->InitFromArgv(argv); |
@@ -3208,7 +3211,8 @@ IN_PROC_BROWSER_TEST_P(RestoreOnStartupPolicyTest, PRE_RunTest) { |
IN_PROC_BROWSER_TEST_P(RestoreOnStartupPolicyTest, RunTest) { |
#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 |
@@ -3327,7 +3331,8 @@ class MediaStreamDevicesControllerBrowserTest |
// TODO(tommi): Remove the kiosk mode flag when the whitelist is visible |
// in the media exceptions UI. |
// See discussion here: https://codereview.chromium.org/15738004/ |
- CommandLine::ForCurrentProcess()->AppendSwitch(switches::kKioskMode); |
+ base::CommandLine::ForCurrentProcess()->AppendSwitch( |
+ switches::kKioskMode); |
// Add an entry to the whitelist that allows the specified URL regardless |
// of the setting of kAudioCapturedAllowed. |