| Index: chrome/browser/ui/browser_command_controller_unittest.cc
|
| diff --git a/chrome/browser/ui/browser_command_controller_unittest.cc b/chrome/browser/ui/browser_command_controller_unittest.cc
|
| index 6204b0b30f9fabfdfa8fa14aeb39d6d44fe4d3e7..c70f664781399855f817ed6098c166bcb1030c0f 100644
|
| --- a/chrome/browser/ui/browser_command_controller_unittest.cc
|
| +++ b/chrome/browser/ui/browser_command_controller_unittest.cc
|
| @@ -176,7 +176,8 @@ TEST_F(BrowserCommandControllerTest, OldAvatarMenuEnabledForOneOrMoreProfiles) {
|
| return;
|
|
|
| // The command line is reset at the end of every test by the test suite.
|
| - switches::DisableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
|
| + switches::DisableNewAvatarMenuForTesting(
|
| + base::CommandLine::ForCurrentProcess());
|
| ASSERT_FALSE(switches::IsNewAvatarMenu());
|
|
|
| TestingProfileManager testing_profile_manager(
|
| @@ -213,7 +214,8 @@ TEST_F(BrowserCommandControllerTest, NewAvatarMenuEnabledWhenOnlyOneProfile) {
|
| return;
|
|
|
| // The command line is reset at the end of every test by the test suite.
|
| - switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
|
| + switches::EnableNewAvatarMenuForTesting(
|
| + base::CommandLine::ForCurrentProcess());
|
|
|
| TestingProfileManager testing_profile_manager(
|
| TestingBrowserProcess::GetGlobal());
|
| @@ -239,7 +241,8 @@ TEST_F(BrowserCommandControllerTest, NewAvatarMenuEnabledInGuestMode) {
|
| return;
|
|
|
| // The command line is reset at the end of every test by the test suite.
|
| - switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
|
| + switches::EnableNewAvatarMenuForTesting(
|
| + base::CommandLine::ForCurrentProcess());
|
|
|
| TestingProfileManager testing_profile_manager(
|
| TestingBrowserProcess::GetGlobal());
|
| @@ -292,9 +295,11 @@ TEST_F(BrowserCommandControllerTest, AvatarMenuAlwaysDisabledInIncognitoMode) {
|
| // Both the old style and the new style avatar menu should be disabled.
|
| EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
|
| if (switches::IsNewAvatarMenu()) {
|
| - switches::DisableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
|
| + switches::DisableNewAvatarMenuForTesting(
|
| + base::CommandLine::ForCurrentProcess());
|
| } else {
|
| - switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
|
| + switches::EnableNewAvatarMenuForTesting(
|
| + base::CommandLine::ForCurrentProcess());
|
| }
|
| EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
|
| // The command line is reset at the end of every test by the test suite.
|
|
|