Re-enable OTP sign in on trunk

chrome/browser/ui/webui/sync_setup_handler_unittest.cc

Index: chrome/browser/ui/webui/sync_setup_handler_unittest.cc
diff --git a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
index 557a8537dc3831236d0d3f12c853ec92212d9419..f8ac64417d1fba985d0ffbb0ac778712fa954be8 100644
--- a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
@@ -357,11 +357,11 @@ class SyncSetupHandlerTest : public testing::TestWithParam<bool> {
     // If the parameter is true, then use ClientOAuth for the tests.  Otherwise
     // use ClientLogin for the tests.
     if (GetParam()) {
-      CommandLine::ForCurrentProcess()->AppendSwitch(
-          switches::kEnableClientOAuthSignin);
-    } else {
       ASSERT_FALSE(CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableClientOAuthSignin));
+          switches::kDisableClientOAuthSignin));
+    } else {
+      CommandLine::ForCurrentProcess()->AppendSwitch(
+          switches::kDisableClientOAuthSignin);
     }
 
     error_ = GoogleServiceAuthError::None();