Merge 176800

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 109 matching lines @@
     profile->GetPrefs()->ClearPref(prefs::kGoogleServicesUsername);
 
   std::string user = profile_->GetPrefs()->GetString(
       prefs::kGoogleServicesUsername);
   if (!user.empty())
     SetAuthenticatedUsername(user);
   // TokenService can be null for unit tests.
   TokenService* token_service = TokenServiceFactory::GetForProfile(profile_);
   if (token_service) {
     token_service->Initialize(GaiaConstants::kChromeSource, profile_);
+    // ChromeOS will kick off TokenService::LoadTokensFromDB from
+    // OAuthLoginManager once the rest of the Profile is fully initialized.
+    // Starting it from here would cause OAuthLoginManager mismatch the origin
+    // of OAuth2 tokens.
+#if !defined(OS_CHROMEOS)
     if (!authenticated_username_.empty()) {
       token_service->LoadTokensFromDB();
     }
+#endif
   }
   if (!user.empty() && !IsAllowedUsername(user)) {
     // User is signed in, but the username is invalid - the administrator must
     // have changed the policy since the last signin, so sign out the user.
     SignOut();
   }
 }
 
 bool SigninManager::IsInitialized() const {
   return profile_ != NULL;
@@ skipping 361 matching lines @@
   DisableOneClickSignIn(profile_);  // Don't ever offer again.
 
   TokenService* token_service = TokenServiceFactory::GetForProfile(profile_);
   token_service->UpdateCredentials(last_result_);
   DCHECK(token_service->AreCredentialsValid());
   token_service->StartFetchingTokens();
 
   // If we have oauth2 tokens, tell token service about them so it does not
   // need to fetch them again.
   if (!temp_oauth_login_tokens_.refresh_token.empty()) {
-    token_service->OnClientOAuthSuccess(temp_oauth_login_tokens_);
+    token_service->UpdateCredentialsWithOAuth2(temp_oauth_login_tokens_);
     temp_oauth_login_tokens_ = ClientOAuthResult();
   }
 }
 
 void SigninManager::OnGetUserInfoFailure(const GoogleServiceAuthError& error) {
   LOG(ERROR) << "Unable to retreive the canonical email address. Login failed.";
   // REVIEW: why does this call OnClientLoginFailure?
   OnClientLoginFailure(error);
 }
 
@@ skipping 35 matching lines @@
       !IsAllowedUsername(authenticated_username_)) {
     // Signed in user is invalid according to the current policy so sign
     // the user out.
     SignOut();
   }
 }
 
 AboutSigninInternals* SigninManager::about_signin_internals() {
   return &about_signin_internals_;
 }