| Index: chrome/browser/profiles/profile_manager_browsertest.cc
|
| diff --git a/chrome/browser/profiles/profile_manager_browsertest.cc b/chrome/browser/profiles/profile_manager_browsertest.cc
|
| index beae82c436c8d9e23b08249866d9fc9197d55fe1..1a89c12982020e3363f817d10adf2c85d69278c3 100644
|
| --- a/chrome/browser/profiles/profile_manager_browsertest.cc
|
| +++ b/chrome/browser/profiles/profile_manager_browsertest.cc
|
| @@ -122,7 +122,7 @@ class PasswordStoreConsumerVerifier :
|
| // platforms.
|
| class ProfileManagerBrowserTest : public InProcessBrowserTest {
|
| protected:
|
| - void SetUpCommandLine(CommandLine* command_line) override {
|
| + void SetUpCommandLine(base::CommandLine* command_line) override {
|
| #if defined(OS_CHROMEOS)
|
| command_line->AppendSwitch(
|
| chromeos::switches::kIgnoreUserProfileMappingForTests);
|
| @@ -215,7 +215,7 @@ IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, DISABLED_DeleteAllProfiles) {
|
|
|
| class ProfileManagerCrOSBrowserTest : public ProfileManagerBrowserTest {
|
| protected:
|
| - virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| + virtual void SetUpCommandLine(base::CommandLine* command_line) override {
|
| // Use a user hash other than the default chrome::kTestUserProfileDir
|
| // so that the prefix case is tested.
|
| command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile,
|
| @@ -270,7 +270,8 @@ IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest,
|
| SwitchToProfile) {
|
| #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
|
|
|
| @@ -338,7 +339,8 @@ IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest,
|
| IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, MAYBE_EphemeralProfile) {
|
| #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
|
|
|
|
|