OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support

chrome/browser/chromeos/login/oauth2_login_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_OAUTH2_LOGIN_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_OAUTH2_LOGIN_MANAGER_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 81 matching lines @@
   // re-attempted.
   bool RetryOnError(const GoogleServiceAuthError& error);
 
   // On successfuly OAuthLogin, starts token service token fetching process.
   void StartTokenService(
       const GaiaAuthConsumer::ClientLoginResult& gaia_credentials);
 
   // Stops listening for a new login refresh token.
   void StopObservingRefreshToken();
 
+  // Signaling methods for merge session start and end events. They ensure
+  // we fire these events exactly once per session restore.
+  void SignalMergeSessionStart();
+  void SignalMergeSessionEnd();
+
   // Keeps the track if we have already reported OAuth2 token being loaded
   // by TokenService.
   bool loading_reported_;
+
+  // Keeps the track if we have already signaled merge session end.

[xiyuan, 2013/09/04 20:12:08]

nit: merge session end -> merge session start?

+  bool session_start_signaled_;
+
   scoped_ptr<OAuth2TokenFetcher> oauth2_token_fetcher_;
   scoped_ptr<OAuth2LoginVerifier> login_verifier_;
+
   // OAuth2 refresh token.
   std::string refresh_token_;
+
   // Authorization code for fetching OAuth2 tokens.
   std::string auth_code_;
 
   DISALLOW_COPY_AND_ASSIGN(OAuth2LoginManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_OAUTH2_LOGIN_MANAGER_H_