This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/signin/token_handle_fetcher.h

Index: chrome/browser/chromeos/login/signin/token_handle_fetcher.h
diff --git a/chrome/browser/chromeos/login/signin/token_handle_fetcher.h b/chrome/browser/chromeos/login/signin/token_handle_fetcher.h
index 5c471a4384c3319c91feafc318da4a1134c88bd9..976ad5d235def68e6ee58c59a1e79cde7d074b9f 100644
--- a/chrome/browser/chromeos/login/signin/token_handle_fetcher.h
+++ b/chrome/browser/chromeos/login/signin/token_handle_fetcher.h
@@ -13,7 +13,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "components/keyed_service/core/keyed_service_shutdown_notifier.h"
-#include "components/user_manager/user_id.h"
+#include "components/signin/core/account_id/account_id.h"
 #include "google_apis/gaia/gaia_oauth_client.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 
@@ -29,11 +29,10 @@ class TokenHandleFetcher : public gaia::GaiaOAuthClient::Delegate,
                            public OAuth2TokenService::Consumer,
                            public OAuth2TokenService::Observer {
  public:
-  TokenHandleFetcher(TokenHandleUtil* util,
-                     const user_manager::UserID& user_id);
+  TokenHandleFetcher(TokenHandleUtil* util, const AccountId& user_id);

[achuithb, 2015/10/23 00:08:50]

account_id

[Alexander Alekseev, 2015/10/23 09:11:22]

Done.

   ~TokenHandleFetcher() override;
 
-  typedef base::Callback<void(const user_manager::UserID&, bool success)>
+  typedef base::Callback<void(const AccountId&, bool success)>
       TokenFetchingCallback;
 
   // Get token handle for user who have just signed in via GAIA. This
@@ -68,7 +67,7 @@ class TokenHandleFetcher : public gaia::GaiaOAuthClient::Delegate,
   void OnProfileDestroyed();
 
   TokenHandleUtil* token_handle_util_;
-  user_manager::UserID user_id_;
+  AccountId user_id_;
   OAuth2TokenService* token_service_;
 
   bool waiting_for_refresh_token_;