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

components/signin/core/common/signin_switches.cc

Index: components/signin/core/common/signin_switches.cc
===================================================================
--- components/signin/core/common/signin_switches.cc	(revision 277945)
+++ components/signin/core/common/signin_switches.cc	(working copy)
@@ -10,18 +10,9 @@
 // expiration of credentials during testing.
 const char kClearTokenService[] = "clear-token-service";
 
-// Disables consistent identity features.
-const char kDisableAccountConsistency[] = "disable-account-consistency";
-
-// Disables new profile management system, including new profile chooser UI.
-const char kDisableNewProfileManagement[] = "disable-new-profile-management";
-
 // Enables consistent identity features.
 const char kEnableAccountConsistency[] = "enable-account-consistency";
 
-// Enables new profile management system, including new profile chooser UI.
-const char kEnableNewProfileManagement[] = "new-profile-management";
-
 // Enables the pure web-based flow for sign in on first run/NTP/wrench menu/
 // settings page.
 const char kEnableWebBasedSignin[] = "enable-web-based-signin";
@@ -42,4 +33,8 @@
 // at the top prompting the user to try out the new profile management UI.
 const char kNewAvatarMenu[] = "new-avatar-menu";
 
+// Use new profile management system, including profile sign-out and new
+// choosers.
+const char kNewProfileManagement[] = "new-profile-management";
+
 }  // namespace switches