Don't overwrite the refresh_token fetched by the policy_oauth_fetcher.

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 131 matching lines @@
 }
 
 void OAuth2LoginManager::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   TokenService* token_service =
       TokenServiceFactory::GetForProfile(user_profile_);
   switch (type) {
     case chrome::NOTIFICATION_TOKEN_LOADING_FINISHED: {
-      refresh_token_ = token_service->GetOAuth2LoginRefreshToken();
-      // TODO(zelidrag): Figure out why just getting GaiaConstants::kGaiaService
-      // token does not do the trick here.
+      // Don't overwrite the |refresh_token_| if it has already been fetched
+      // by the |oauth2_policy_fetcher_|.
+      if (restore_from_auth_cookies_ &&
+          !token_service->GetOAuth2LoginRefreshToken().empty()) {
+        refresh_token_ = token_service->GetOAuth2LoginRefreshToken();
+      }
       RestoreSessionCookies();
       break;
     }
     case chrome::NOTIFICATION_TOKEN_AVAILABLE: {
       // This path should kick on only when we mint a new OAuth2 refresh
       // token for user cookies. Otherwise, wait for all tokens to load above.
       if (!restore_from_auth_cookies_)
         return;
 
       TokenService::TokenAvailableDetails* token_details =
@@ skipping 85 matching lines @@
 }
 
 void OAuth2LoginManager::StartTokenService(
     const GaiaAuthConsumer::ClientLoginResult& gaia_credentials) {
   TokenService* token_service = SetupTokenService();
   token_service->UpdateCredentials(gaia_credentials);
   CompleteAuthentication();
 }
 
 }  // namespace chromeos