Merge 150797 - Revert 148201 - Re-enable OTP sign in on trunk by reverting most of 147297.

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
===================================================================
--- chrome/common/chrome_switches.cc	(revision 151028)
+++ chrome/common/chrome_switches.cc	(working copy)
@@ -270,10 +270,6 @@
 // Disables the bundled PPAPI version of Flash (if it's enabled by default).
 const char kDisableBundledPpapiFlash[]      = "disable-bundled-ppapi-flash";
 
-// Disable the ClientOAuth signin flow for connecting a profile to a Google
-// account.  When disabled, Chrome will use the ClientLogin flow instead.
-const char kDisableClientOAuthSignin[]      = "disable-client-oauth-signin";
-
 // Disables Chrome To Mobile.
 const char kDisableChromeToMobile[]         = "disable-chrome-to-mobile";
 
@@ -481,6 +477,10 @@
 // Enables the bundled PPAPI version of Flash.
 const char kEnableBundledPpapiFlash[]       = "enable-bundled-ppapi-flash";
 
+// Enables the new ClientOAuth signin flow for connecting a profile a Google
+// account.  When disabled, Chrome will use the ClientLogin flow instead.
+const char kEnableClientOAuthSignin[]       = "enable-client-oauth-signin";
+
 // Enables Chrome To Mobile.
 // This switch is not currently respected; use the disable switch instead.
 const char kEnableChromeToMobile[]          = "enable-chrome-to-mobile";