OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support

chrome/browser/chromeos/login/oauth2_login_manager.h

Index: chrome/browser/chromeos/login/oauth2_login_manager.h
diff --git a/chrome/browser/chromeos/login/oauth2_login_manager.h b/chrome/browser/chromeos/login/oauth2_login_manager.h
index ea7e2c78d818f816a8c82e217cd3c17ec9073b28..48a682ceba3b18529c903af21601df51b151216b 100644
--- a/chrome/browser/chromeos/login/oauth2_login_manager.h
+++ b/chrome/browser/chromeos/login/oauth2_login_manager.h
@@ -99,13 +99,24 @@ class OAuth2LoginManager : public OAuthLoginManager,
   // 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_;