| Index: chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
|
| diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
|
| index 614dcd2d0ce914b61000082135f784d07007126b..317df7ac76023006d8399ee3aa9f0696b98d0c27 100644
|
| --- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
|
| +++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
|
| @@ -91,7 +91,7 @@ class ProfileChooserControllerTest : public CocoaProfileTest {
|
| }
|
|
|
| void EnableFastUserSwitching() {
|
| - CommandLine::ForCurrentProcess()->AppendSwitch(
|
| + base::CommandLine::ForCurrentProcess()->AppendSwitch(
|
| switches::kFastUserSwitching);
|
| }
|
|
|
| @@ -108,7 +108,8 @@ class ProfileChooserControllerTest : public CocoaProfileTest {
|
| };
|
|
|
| TEST_F(ProfileChooserControllerTest, InitialLayoutWithNewMenu) {
|
| - switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
|
| + switches::EnableNewAvatarMenuForTesting(
|
| + base::CommandLine::ForCurrentProcess());
|
| StartProfileChooserController();
|
|
|
| NSArray* subviews = [[[controller() window] contentView] subviews];
|
| @@ -174,7 +175,8 @@ TEST_F(ProfileChooserControllerTest, InitialLayoutWithNewMenu) {
|
| }
|
|
|
| TEST_F(ProfileChooserControllerTest, InitialLayoutWithFastUserSwitcher) {
|
| - switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
|
| + switches::EnableNewAvatarMenuForTesting(
|
| + base::CommandLine::ForCurrentProcess());
|
| EnableFastUserSwitching();
|
| StartProfileChooserController();
|
|
|
| @@ -237,7 +239,8 @@ TEST_F(ProfileChooserControllerTest, InitialLayoutWithFastUserSwitcher) {
|
| }
|
|
|
| TEST_F(ProfileChooserControllerTest, OtherProfilesSortedAlphabetically) {
|
| - switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
|
| + switches::EnableNewAvatarMenuForTesting(
|
| + base::CommandLine::ForCurrentProcess());
|
| EnableFastUserSwitching();
|
|
|
| // Add two extra profiles, to make sure sorting is alphabetical and not
|
| @@ -282,7 +285,8 @@ TEST_F(ProfileChooserControllerTest, OtherProfilesSortedAlphabetically) {
|
|
|
| TEST_F(ProfileChooserControllerTest,
|
| LocalProfileActiveCardLinksWithNewMenu) {
|
| - switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
|
| + switches::EnableNewAvatarMenuForTesting(
|
| + base::CommandLine::ForCurrentProcess());
|
| StartProfileChooserController();
|
| NSArray* subviews = [[[controller() window] contentView] subviews];
|
| ASSERT_EQ(2U, [subviews count]);
|
| @@ -307,7 +311,7 @@ TEST_F(ProfileChooserControllerTest,
|
| TEST_F(ProfileChooserControllerTest,
|
| SignedInProfileActiveCardLinksWithAccountConsistency) {
|
| switches::EnableAccountConsistencyForTesting(
|
| - CommandLine::ForCurrentProcess());
|
| + base::CommandLine::ForCurrentProcess());
|
| // Sign in the first profile.
|
| ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
|
| cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
|
| @@ -329,7 +333,8 @@ TEST_F(ProfileChooserControllerTest,
|
|
|
| TEST_F(ProfileChooserControllerTest,
|
| SignedInProfileActiveCardLinksWithNewMenu) {
|
| - switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
|
| + switches::EnableNewAvatarMenuForTesting(
|
| + base::CommandLine::ForCurrentProcess());
|
| // Sign in the first profile.
|
| ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
|
| cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
|
| @@ -352,7 +357,7 @@ TEST_F(ProfileChooserControllerTest,
|
|
|
| TEST_F(ProfileChooserControllerTest, AccountManagementLayout) {
|
| switches::EnableAccountConsistencyForTesting(
|
| - CommandLine::ForCurrentProcess());
|
| + base::CommandLine::ForCurrentProcess());
|
| // Sign in the first profile.
|
| ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
|
| cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
|
| @@ -466,7 +471,7 @@ TEST_F(ProfileChooserControllerTest, AccountManagementLayout) {
|
|
|
| TEST_F(ProfileChooserControllerTest, SignedInProfileLockDisabled) {
|
| switches::EnableNewProfileManagementForTesting(
|
| - CommandLine::ForCurrentProcess());
|
| + base::CommandLine::ForCurrentProcess());
|
| // Sign in the first profile.
|
| ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
|
| cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
|
| @@ -492,7 +497,7 @@ TEST_F(ProfileChooserControllerTest, SignedInProfileLockDisabled) {
|
|
|
| TEST_F(ProfileChooserControllerTest, SignedInProfileLockEnabled) {
|
| switches::EnableNewProfileManagementForTesting(
|
| - CommandLine::ForCurrentProcess());
|
| + base::CommandLine::ForCurrentProcess());
|
| // Sign in the first profile.
|
| ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
|
| cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
|
|
|