Index: chrome/browser/signin/signin_manager.cc |
diff --git a/chrome/browser/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc |
index 2279e4653fdafee62dd02b0fc5c26ae048672726..aed460a07ba5a1c6b928c95d80fcae2a4535c0c5 100644 |
--- a/chrome/browser/signin/signin_manager.cc |
+++ b/chrome/browser/signin/signin_manager.cc |
@@ -611,35 +611,6 @@ void SigninManager::OnSignedIn(const std::string& username) { |
} |
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) { |