Reset the OAuth2LoginManager fetchers when restoring a new session.

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/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/string_util.h"
@@ skipping 49 matching lines @@
   // TokenService notifications of a user that was previously active.
   // http://crbug.com/230342
   registrar_.RemoveAll();
   user_profile_ = user_profile;
   auth_request_context_ = auth_request_context;
   state_ = OAuthLoginManager::SESSION_RESTORE_IN_PROGRESS;
   restore_strategy_ = restore_strategy;
   refresh_token_ = oauth2_refresh_token;
   auth_code_ = auth_code;
 
+  // TODO(nkostylev): drop the previous fetchers if RestoreSession() is invoked
+  // for a second Profile, when using multi-profiles. This avoids the DCHECKs
+  // below until OAuthLoginManager fully supports multi-profiles.
+  Stop();
+
   // 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";
     // We already have tokens, no need to get them from the cookie jar again.
     if (restore_strategy_ == RESTORE_FROM_COOKIE_JAR)
@@ skipping 218 matching lines @@
 }
 
 void OAuth2LoginManager::StartTokenService(
     const GaiaAuthConsumer::ClientLoginResult& gaia_credentials) {
   TokenService* token_service = SetupTokenService();
   token_service->UpdateCredentials(gaia_credentials);
   CompleteAuthentication();
 }
 
 }  // namespace chromeos