Move token handle obtaining to UserSessionManager

chrome/browser/chromeos/login/session/user_session_manager.h

Index: chrome/browser/chromeos/login/session/user_session_manager.h
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.h b/chrome/browser/chromeos/login/session/user_session_manager.h
index b86b20340bcdb810d72ac14e171331ede4acc6e8..b1e74661390cfcaaf651dd4ce3df9ea9e72a6b7d 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.h
+++ b/chrome/browser/chromeos/login/session/user_session_manager.h
@@ -15,6 +15,7 @@
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/base/locale_util.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
+#include "chrome/browser/chromeos/login/signin/token_handle_util.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/login/auth/authenticator.h"
 #include "chromeos/login/auth/user_context.h"
@@ -218,6 +219,9 @@ class UserSessionManager
 
   void ActiveUserChanged(const user_manager::User* active_user) override;
 
+  // This method will be called when user have obtained oauth2 tokens.
+  void OnOAuth2TokensFetched(UserContext context);
+
   // Returns default IME state for user session.
   scoped_refptr<input_method::InputMethodManager::State> GetDefaultIMEState(
       Profile* profile);
@@ -237,6 +241,8 @@ class UserSessionManager
   const UserContext& user_context() const { return user_context_; }
   bool has_auth_cookies() const { return has_auth_cookies_; }
 
+  void Shutdown();
+
  private:
   friend class test::UserSessionManagerTestApi;
   friend struct DefaultSingletonTraits<UserSessionManager>;
@@ -360,6 +366,13 @@ class UserSessionManager
       InputEventsBlocker* input_events_blocker,
       const locale_util::LanguageSwitchResult& result);
 
+  // Callback invoked when |token_handle_util_| has finished.
+  void OnTokenHandleObtained(const user_manager::UserID& id,
+                             TokenHandleUtil::TokenHandleStatus status);
+
+  // Returns |true| if token handles should be used on this device.
+  bool TokenHandlesEnabled();
+
   // Test API methods.
 
   // Injects |user_context| that will be used to create StubAuthenticator
@@ -444,6 +457,8 @@ class UserSessionManager
   bool running_easy_unlock_key_ops_;
   base::Closure easy_unlock_key_ops_finished_callback_;
 
+  scoped_ptr<TokenHandleUtil> token_handle_util_;
+
   // Whether should launch browser, tests may override this value.
   bool should_launch_browser_;