Enable consistent identity on android platform by default.

chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm

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 929e392363fae92a3a0ffd021546c8a6fea442ad..eecccfb85be7acaa40f902f7e79fdf9c87cada87 100644
--- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
@@ -22,6 +22,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
+#include "components/signin/core/common/profile_management_switches.h"
 
 const std::string kEmail = "user@gmail.com";
 const std::string kSecondaryEmail = "user2@gmail.com";
@@ -74,11 +75,6 @@ class ProfileChooserControllerTest : public CocoaProfileTest {
     [controller_ showWindow:nil];
   }
 
-  void EnableNewProfileManagement() {
-    CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kNewProfileManagement);
-  }
-
   void EnableNewAvatarMenuOnly() {
     CommandLine::ForCurrentProcess()->AppendSwitch(switches::kNewAvatarMenu);
   }
@@ -101,7 +97,8 @@ class ProfileChooserControllerTest : public CocoaProfileTest {
 };
 
 TEST_F(ProfileChooserControllerTest, InitialLayoutWithNewManagement) {
-  EnableNewProfileManagement();
+  switches::EnableNewProfileManagementForTesting(
+      CommandLine::ForCurrentProcess());
   StartProfileChooserController();
 
   NSArray* subviews = [[[controller() window] contentView] subviews];
@@ -201,7 +198,8 @@ TEST_F(ProfileChooserControllerTest, InitialLayoutWithNewMenu) {
 }
 
 TEST_F(ProfileChooserControllerTest, InitialLayoutWithFastUserSwitcher) {
-  EnableNewProfileManagement();
+  switches::EnableNewProfileManagementForTesting(
+      CommandLine::ForCurrentProcess());
   EnableFastUserSwitching();
   StartProfileChooserController();
 
@@ -284,8 +282,9 @@ TEST_F(ProfileChooserControllerTest, OtherProfilesSortedAlphabetically) {
 }
 
 TEST_F(ProfileChooserControllerTest,
-    LocalProfileActiveCardLinksWithNewManagement) {
-  EnableNewProfileManagement();
+       LocalProfileActiveCardLinksWithNewManagement) {
+  switches::EnableNewProfileManagementForTesting(
+      CommandLine::ForCurrentProcess());
   StartProfileChooserController();
   NSArray* subviews = [[[controller() window] contentView] subviews];
   EXPECT_EQ(1U, [subviews count]);
@@ -320,8 +319,9 @@ TEST_F(ProfileChooserControllerTest,
 }
 
 TEST_F(ProfileChooserControllerTest,
-    SignedInProfileActiveCardLinksWithNewManagement) {
-  EnableNewProfileManagement();
+       SignedInProfileActiveCardLinksWithNewManagement) {
+  switches::EnableNewProfileManagementForTesting(
+      CommandLine::ForCurrentProcess());
   // Sign in the first profile.
   ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
   cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
@@ -365,7 +365,8 @@ TEST_F(ProfileChooserControllerTest,
 }
 
 TEST_F(ProfileChooserControllerTest, AccountManagementLayout) {
-  EnableNewProfileManagement();
+  switches::EnableNewProfileManagementForTesting(
+      CommandLine::ForCurrentProcess());
   // Sign in the first profile.
   ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
   cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));