Re-enable OTP sign in on trunk

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 95387a0b70e7c53862536c66453fffed21a6fde7..c9015cdd173d83d4ce1865aadefe1d917747dfd8 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -274,6 +274,10 @@ const char kDisableBackgroundNetworking[]   = "disable-background-networking";
 // 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,10 +485,6 @@ const char kEnableBenchmarking[]            = "enable-benchmarking";
 // 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";