Enable account reconcilor when --new-profile-management is used.

chrome/browser/signin/signin_manager.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/signin/signin_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 593 matching lines @@
       content::Details<const GoogleServiceSigninSuccessDetails>(&details));
 
   // Don't store password hash except for users of new profile features.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kNewProfileManagement)) {
     std::string auth_username = GetAuthenticatedUsername();
     chrome::SetLocalAuthCredentials(profile_, auth_username, password_);
   }
   password_.clear();  // Don't need it anymore.
   DisableOneClickSignIn(profile_);  // Don't ever offer again.
-
-  if (type_ == SIGNIN_TYPE_WITH_OAUTH_CODE &&
-      !temp_oauth_login_tokens_.access_token.empty())
-    // Cookie jar may not be set up properly, need to first get an uber token
-    // and then merge sessions with the token.
-    client_login_->StartTokenFetchForUberAuthExchange(
-        temp_oauth_login_tokens_.access_token);
-}
-
-void SigninManager::OnUberAuthTokenSuccess(const std::string& token) {
-  DVLOG(1) << "SigninManager::OnUberAuthTokenSuccess";
-  NotifyDiagnosticsObservers(UBER_TOKEN_STATUS, "Successful");
-  client_login_->StartMergeSession(token);
-}
-
-void SigninManager::OnMergeSessionSuccess(const std::string& data) {
-  DVLOG(1) << "SigninManager::OnMergeSessionSuccess";
-  NotifyDiagnosticsObservers(MERGE_SESSION_STATUS, "Successful");
-}
-
-void SigninManager::OnMergeSessionFailure(const GoogleServiceAuthError& error) {
-  LOG(ERROR) << "Unable to mereg sessions. Login failed.";
-  NotifyDiagnosticsObservers(MERGE_SESSION_STATUS, error.ToString());
-}
-
-void SigninManager::OnUberAuthTokenFailure(
-    const GoogleServiceAuthError& error) {
-  LOG(ERROR) << "Unable to retreive the uber token. Login failed.";
-  NotifyDiagnosticsObservers(UBER_TOKEN_STATUS, error.ToString());
 }
 
 void SigninManager::OnGetUserInfoFailure(const GoogleServiceAuthError& error) {
   LOG(ERROR) << "Unable to retreive the canonical email address. Login failed.";
   NotifyDiagnosticsObservers(GET_USER_INFO_STATUS, error.ToString());
   // REVIEW: why does this call OnClientLoginFailure?
   OnClientLoginFailure(error);
 }
 
 void SigninManager::Observe(int type,
@@ skipping 14 matching lines @@
   }
 }
 
 void SigninManager::ProhibitSignout(bool prohibit_signout) {
   prohibit_signout_ = prohibit_signout;
 }
 
 bool SigninManager::IsSignoutProhibited() const {
   return prohibit_signout_;
 }