Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(951)

Unified Diff: chrome/browser/ui/browser_command_controller_unittest.cc

Issue 323133005: Enable consistent identity on android platform by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 60ac52170faef588d77cea6cf7f31cb2e22a6d7e..8f4b72bd50370c065226b193bbabdf688bd18e20 100644
--- a/chrome/browser/ui/browser_command_controller_unittest.cc
+++ b/chrome/browser/ui/browser_command_controller_unittest.cc
@@ -211,9 +211,8 @@ TEST_F(BrowserCommandControllerTest, NewAvatarMenuEnabledWhenOnlyOneProfile) {
return;
// The command line is reset at the end of every test by the test suite.
- CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kNewProfileManagement);
- EXPECT_TRUE(switches::IsNewProfileManagement());
+ switches::EnableNewProfileManagementForTesting(
+ CommandLine::ForCurrentProcess());
TestingProfileManager testing_profile_manager(
TestingBrowserProcess::GetGlobal());
@@ -239,9 +238,8 @@ TEST_F(BrowserCommandControllerTest, NewAvatarMenuEnabledInGuestMode) {
return;
// The command line is reset at the end of every test by the test suite.
- CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kNewProfileManagement);
- EXPECT_TRUE(switches::IsNewProfileManagement());
+ switches::EnableNewProfileManagementForTesting(
+ CommandLine::ForCurrentProcess());
TestingProfileManager testing_profile_manager(
TestingBrowserProcess::GetGlobal());
@@ -294,9 +292,8 @@ TEST_F(BrowserCommandControllerTest, AvatarMenuAlwaysDisabledInIncognitoMode) {
// The new style avatar menu should also be disabled.
// The command line is reset at the end of every test by the test suite.
- CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kNewProfileManagement);
- EXPECT_TRUE(switches::IsNewProfileManagement());
+ switches::EnableNewProfileManagementForTesting(
+ CommandLine::ForCurrentProcess());
EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
}

Powered by Google App Engine
This is Rietveld 408576698