Re-enable OTP sign in on trunk by reverting most of 147297.
I am not simply reverting 147297 because that CL included some js code for correctly handling errors in the ASP case, and that is still useful should the user decide to go back to ASPs.
Change that disabled OTP on trunk:
https://chromiumcodereview.appspot.com/10800010
http:crrev.com/147297
BUG=137772
TEST=Signing in should ask for OTP instead of ASP.
Review URL: https://chromiumcodereview.appspot.com/10800010
Review URL: https://chromiumcodereview.appspot.com/10818006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148201 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index f0571eb8..dfdb452 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -730,11 +730,11 @@
},
#endif
{
- "enable-client-oauth-signin",
- IDS_FLAGS_ENABLE_CLIENT_OAUTH_SIGNIN_NAME,
- IDS_FLAGS_ENABLE_CLIENT_OAUTH_SIGNIN_DESCRIPTION,
+ "disable-client-oauth-signin",
+ IDS_FLAGS_DISABLE_CLIENT_OAUTH_SIGNIN_NAME,
+ IDS_FLAGS_DISABLE_CLIENT_OAUTH_SIGNIN_DESCRIPTION,
kOsMac | kOsWin | kOsLinux,
- SINGLE_VALUE_TYPE(switches::kEnableClientOAuthSignin)
+ SINGLE_VALUE_TYPE(switches::kDisableClientOAuthSignin)
},
#if defined(USE_ASH)
{
