Revert of 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 40046ef0ce204a6e6b24aa1574e122ef743cbb11..b86b20340bcdb810d72ac14e171331ede4acc6e8 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.h
+++ b/chrome/browser/chromeos/login/session/user_session_manager.h
@@ -15,7 +15,6 @@
 #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"
@@ -219,9 +218,6 @@
 
   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);
@@ -363,13 +359,6 @@
       const base::Closure& callback,
       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.
 
@@ -455,8 +444,6 @@
   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_;