OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support

chrome/browser/chromeos/profiles/profile_helper.h

Index: chrome/browser/chromeos/profiles/profile_helper.h
diff --git a/chrome/browser/chromeos/profiles/profile_helper.h b/chrome/browser/chromeos/profiles/profile_helper.h
index 54fa8adefab226bbef092a539c37cab44352085c..611690ff90f4d32da3f419b78ee902b7116f35e5 100644
--- a/chrome/browser/chromeos/profiles/profile_helper.h
+++ b/chrome/browser/chromeos/profiles/profile_helper.h
@@ -12,6 +12,7 @@
 #include "base/callback_forward.h"
 #include "base/files/file_path.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
+#include "chrome/browser/chromeos/login/oauth2_login_manager.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 
 class Profile;
@@ -30,7 +31,7 @@ namespace chromeos {
 //    GetActiveUserProfileDir()
 // 3. Get mapping from user_id_hash to Profile instance/profile path etc.
 class ProfileHelper : public BrowsingDataRemover::Observer,
-                      public UserManager::Observer,
+                      public OAuth2LoginManager::Observer,
                       public UserManager::UserSessionStateObserver {
  public:
   ProfileHelper();
@@ -57,7 +58,7 @@ class ProfileHelper : public BrowsingDataRemover::Observer,
 
   // Initialize a bunch of services that are tied to a browser profile.
   // TODO(dzhioev): Investigate whether or not this method is needed.
-  static void ProfileStartup(Profile* profile, bool process_startup);
+  void ProfileStartup(Profile* profile, bool process_startup);
 
   // Returns active user profile dir in a format [u-$hash].
   base::FilePath GetActiveUserProfileDir();
@@ -80,8 +81,9 @@ class ProfileHelper : public BrowsingDataRemover::Observer,
   virtual void OnBrowsingDataRemoverDone() OVERRIDE;
 
   // UserManager::Observer overrides.
-  virtual void MergeSessionStateChanged(
-      UserManager::MergeSessionState state) OVERRIDE;
+  virtual void OnSessionRestoreStateChanged(
+      Profile* user_profile,
+      OAuth2LoginManager::SessionRestoreState state) OVERRIDE;
 
   // UserManager::UserSessionStateObserver implementation:
   virtual void ActiveUserHashChanged(const std::string& hash) OVERRIDE;