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

chrome/browser/ui/webui/sync_setup_handler_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/sync_setup_handler.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
@@ skipping 340 matching lines @@
 
 // The boolean parameter indicates whether the test is run with ClientOAuth
 // or not.
 class SyncSetupHandlerTest : public testing::TestWithParam<bool> {
  public:
   SyncSetupHandlerTest() : error_(GoogleServiceAuthError::NONE) {}
   virtual void SetUp() OVERRIDE {
     // 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::kDisableClientOAuthSignin));
-    } else {
-      CommandLine::ForCurrentProcess()->AppendSwitch(
-          switches::kDisableClientOAuthSignin);
+          switches::kEnableClientOAuthSignin));
     }
 
     error_ = GoogleServiceAuthError::None();
     profile_.reset(ProfileSyncServiceMock::MakeSignedInTestingProfile());
     SyncPromoUI::RegisterUserPrefs(profile_->GetPrefs());
     mock_pss_ = static_cast<ProfileSyncServiceMock*>(
         ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(
             profile_.get(),
             ProfileSyncServiceMock::BuildMockProfileSyncService));
     mock_signin_ = static_cast<SigninManagerMock*>(
@@ skipping 777 matching lines @@
   CheckShowSyncSetupArgs(
       dictionary, err, false, GoogleServiceAuthError::NONE, "", true, "");
   handler_->CloseSyncSetup();
   EXPECT_EQ(NULL,
             LoginUIServiceFactory::GetForProfile(
                 profile_.get())->current_login_ui());
 }
 
 INSTANTIATE_TEST_CASE_P(SyncSetupHandlerTest, SyncSetupHandlerTest,
                         Values(true, false));