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

chrome/browser/sync/profile_sync_service_harness.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/sync/profile_sync_service_harness.h"
 
 #include <cstddef>
 #include <iterator>
 #include <ostream>
 #include <set>
@@ skipping 157 matching lines @@
 
   // Subscribe sync client to notifications from the profile sync service.
   if (!service_->HasObserver(this))
     service_->AddObserver(this);
 
   // Tell the sync service that setup is in progress so we don't start syncing
   // until we've finished configuration.
   service_->SetSetupInProgress(true);
 
   // Authenticate sync client using GAIA credentials.
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableClientOAuthSignin)) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableClientOAuthSignin)) {
     service_->signin()->StartSignInWithOAuth(username_, password_);
   } else {
     service_->signin()->StartSignIn(username_, password_, "", "");
   }
 
   // Wait for the OnBackendInitialized() callback.
   if (!AwaitBackendInitialized()) {
     LOG(ERROR) << "OnBackendInitialized() not seen after "
                << kLiveSyncOperationTimeoutMs / 1000
                << " seconds.";
@@ skipping 918 matching lines @@
 
 std::string ProfileSyncServiceHarness::GetServiceStatus() {
   scoped_ptr<DictionaryValue> value(
       sync_ui_util::ConstructAboutInformation(service_));
   std::string service_status;
   base::JSONWriter::WriteWithOptions(value.get(),
                                      base::JSONWriter::OPTIONS_PRETTY_PRINT,
                                      &service_status);
   return service_status;
 }