diff options
| author | avi <avi@chromium.org> | 2014-12-22 15:31:43 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-22 23:32:42 +0000 |
| commit | 556c05027f6d983007890054b6a9303a2bd4a4a2 (patch) | |
| tree | b98340940909e087f8779f6b3aefe97afda17ed2 /chrome/browser/ui/browser_command_controller_unittest.cc | |
| parent | 6b8237f513dc4cd044ff117fc12ee9178b4562e8 (diff) | |
| download | chromium_src-556c05027f6d983007890054b6a9303a2bd4a4a2.zip chromium_src-556c05027f6d983007890054b6a9303a2bd4a4a2.tar.gz chromium_src-556c05027f6d983007890054b6a9303a2bd4a4a2.tar.bz2 | |
Make callers of CommandLine use it via the base:: namespace.
Covers chrome/browser/* from f on.
BUG=422426
TEST=none
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/816403003
Cr-Commit-Position: refs/heads/master@{#309485}
Diffstat (limited to 'chrome/browser/ui/browser_command_controller_unittest.cc')
| -rw-r--r-- | chrome/browser/ui/browser_command_controller_unittest.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/chrome/browser/ui/browser_command_controller_unittest.cc b/chrome/browser/ui/browser_command_controller_unittest.cc index 6204b0b..c70f664 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. |