Added step that saves OAuth2 tokens fetched through policy into TokenService.

chrome/browser/chromeos/login/oauth2_login_manager.cc

 // Copyright (c) 2013 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/chromeos/login/oauth2_login_manager.h"
 
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ skipping 18 matching lines @@
 OAuth2LoginManager::~OAuth2LoginManager() {
 }
 
 void OAuth2LoginManager::RestoreSession(
     Profile* user_profile,
     net::URLRequestContextGetter* auth_request_context,
     bool restore_from_auth_cookies) {
   user_profile_ = user_profile;
   auth_request_context_ = auth_request_context;
   state_ = OAuthLoginManager::SESSION_RESTORE_IN_PROGRESS;
+  restore_from_auth_cookies_ = restore_from_auth_cookies;
 
   // TODO(zelidrag): Remove eventually the next line in some future milestone.
   RemoveLegacyTokens();
 
   // Reuse the access token fetched by the OAuth2PolicyFetcher, if it was
   // used to fetch policies before Profile creation.
   if (oauth2_policy_fetcher_.get() &&
       oauth2_policy_fetcher_->has_oauth2_tokens()) {
     VLOG(1) << "Resuming profile creation after fetching policy token";
-    refresh_token_ = oauth2_policy_fetcher_->oauth2_tokens().refresh_token;
-    restore_from_auth_cookies = false;
+    // We already have tokens, no need to get them from the cookie jar again.
+    restore_from_auth_cookies_ = false;
+    StoreOAuth2Tokens(oauth2_policy_fetcher_->oauth2_tokens());
   }
-  restore_from_auth_cookies_ = restore_from_auth_cookies;
+
   ContinueSessionRestore();
 }
 
 void OAuth2LoginManager::ContinueSessionRestore() {
   if (restore_from_auth_cookies_) {
     FetchOAuth2Tokens();
     return;
   }
 
-  // Did we already fetch the refresh token (either policy or db)?
-  if (!refresh_token_.empty()) {
-    // TODO(zelidrag): Figure out where to stick that refresh_token_ into.
-    // We probalby need bit more than that.
-  }
   LoadAndVerifyOAuth2Tokens();
 }
 
 void OAuth2LoginManager::RestorePolicyTokens(
     net::URLRequestContextGetter* auth_request_context) {
   oauth2_policy_fetcher_.reset(
       new OAuth2PolicyFetcher(auth_request_context,
                               g_browser_process->system_request_context()));
   oauth2_policy_fetcher_->Start();
 }
@@ skipping 24 matching lines @@
                             PrefServiceSyncable::UNSYNCABLE_PREF);
   prefs->RegisterStringPref(prefs::kOAuth1Secret,
                             "",
                             PrefServiceSyncable::UNSYNCABLE_PREF);
   prefs->ClearPref(prefs::kOAuth1Token);
   prefs->ClearPref(prefs::kOAuth1Secret);
   prefs->UnregisterPreference(prefs::kOAuth1Token);
   prefs->UnregisterPreference(prefs::kOAuth1Secret);
 }
 
+void OAuth2LoginManager::StoreOAuth2Tokens(
+    const GaiaAuthConsumer::ClientOAuthResult& oauth2_tokens) {
+  TokenService* token_service =
+      TokenServiceFactory::GetForProfile(user_profile_);
+  token_service->UpdateCredentialsWithOAuth2(oauth2_tokens);
+}
+
 void OAuth2LoginManager::LoadAndVerifyOAuth2Tokens() {
   // If we have no cookies, try to load saved OAuth2 token from TokenService.
   TokenService* token_service = SetupTokenService();
   token_service->Initialize(GaiaConstants::kChromeSource, user_profile_);
   token_service->LoadTokensFromDB();
 }
 
 void OAuth2LoginManager::FetchOAuth2Tokens() {
   DCHECK(auth_request_context_.get());
   // If we have authenticated cookie jar, get OAuth1 token first, then fetch
   // SID/LSID cookies through OAuthLogin call.
   oauth2_token_fetcher_.reset(
       new OAuth2TokenFetcher(this, auth_request_context_));
   oauth2_token_fetcher_->Start();
 }
 
 void OAuth2LoginManager::OnOAuth2TokensAvailable(
     const GaiaAuthConsumer::ClientOAuthResult& oauth2_tokens) {
   LOG(INFO) << "OAuth2 tokens fetched";
-  TokenService* token_service = SetupTokenService();
-  token_service->UpdateCredentialsWithOAuth2(oauth2_tokens);
+  StoreOAuth2Tokens(oauth2_tokens);
 }
 
 void OAuth2LoginManager::OnOAuth2TokensFetchFailed() {
   LOG(ERROR) << "OAuth2 tokens fetch failed!";
   state_ = OAuthLoginManager::SESSION_RESTORE_DONE;
   UserManager::Get()->SaveUserOAuthStatus(
       UserManager::Get()->GetLoggedInUser()->email(),
       User::OAUTH2_TOKEN_STATUS_INVALID);
   UMA_HISTOGRAM_ENUMERATION("OAuth2Login.SessionRestore",
                             SESSION_RESTORE_TOKEN_FETCH_FAILED,
@@ skipping 109 matching lines @@
 }
 
 void OAuth2LoginManager::StartTokenService(
     const GaiaAuthConsumer::ClientLoginResult& gaia_credentials) {
   TokenService* token_service = SetupTokenService();
   token_service->UpdateCredentials(gaia_credentials);
   CompleteAuthentication();
 }
 
 }  // namespace chromeos