Revert 277793 "Enable consistent identity on android platform by..."

chrome/browser/ui/browser_command_controller_unittest.cc

Index: chrome/browser/ui/browser_command_controller_unittest.cc
===================================================================
--- chrome/browser/ui/browser_command_controller_unittest.cc	(revision 277945)
+++ chrome/browser/ui/browser_command_controller_unittest.cc	(working copy)
@@ -211,8 +211,9 @@
     return;
 
   // The command line is reset at the end of every test by the test suite.
-  switches::EnableNewProfileManagementForTesting(
-      CommandLine::ForCurrentProcess());
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kNewProfileManagement);
+  EXPECT_TRUE(switches::IsNewProfileManagement());
 
   TestingProfileManager testing_profile_manager(
       TestingBrowserProcess::GetGlobal());
@@ -238,8 +239,9 @@
     return;
 
   // The command line is reset at the end of every test by the test suite.
-  switches::EnableNewProfileManagementForTesting(
-      CommandLine::ForCurrentProcess());
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kNewProfileManagement);
+  EXPECT_TRUE(switches::IsNewProfileManagement());
 
   TestingProfileManager testing_profile_manager(
       TestingBrowserProcess::GetGlobal());
@@ -292,8 +294,9 @@
 
   // The new style avatar menu should also be disabled.
   // The command line is reset at the end of every test by the test suite.
-  switches::EnableNewProfileManagementForTesting(
-      CommandLine::ForCurrentProcess());
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kNewProfileManagement);
+  EXPECT_TRUE(switches::IsNewProfileManagement());
   EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
 }