Re-enable OTP sign in on trunk

chrome/browser/ui/webui/sync_setup_handler.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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 168 matching lines @@
   if (user.find_first_of(ASCIIToUTF16("@")) != string16::npos)
     return user;
   return user + ASCIIToUTF16("@") + ASCIIToUTF16(kDefaultSigninDomain);
 }
 
 bool AreUserNamesEqual(const string16& user1, const string16& user2) {
   return NormalizeUserName(user1) == NormalizeUserName(user2);
 }
 
 bool IsClientOAuthEnabled() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableClientOAuthSignin);
+  return !CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableClientOAuthSignin);
 }
 
 }  // namespace
 
 SyncSetupHandler::SyncSetupHandler(ProfileManager* profile_manager)
     : configuring_sync_(false),
       profile_manager_(profile_manager),
       last_signin_error_(GoogleServiceAuthError::NONE),
       retry_on_signin_failure_(true) {
 }
@@ skipping 843 matching lines @@
     if (i != current_profile_index && AreUserNamesEqual(
         cache.GetUserNameOfProfileAtIndex(i), username_utf16)) {
       *error_message = l10n_util::GetStringUTF16(
           IDS_SYNC_USER_NAME_IN_USE_ERROR);
       return false;
     }
   }
 
   return true;
 }