This CL replaces user_manager::UserID with AccountId.

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_OAUTH2_LOGIN_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_OAUTH2_LOGIN_MANAGER_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 148 matching lines @@
   void OnListAccountsSuccess(
       const std::vector<gaia::ListedAccount>& accounts) override;
   void OnListAccountsFailure(bool connection_error) override;
 
   // OAuth2TokenFetcher::Delegate overrides.
   void OnOAuth2TokensAvailable(
       const GaiaAuthConsumer::ClientOAuthResult& oauth2_tokens) override;
   void OnOAuth2TokensFetchFailed() override;
 
   // OAuth2TokenService::Observer implementation:
-  void OnRefreshTokenAvailable(const std::string& account_id) override;
+  void OnRefreshTokenAvailable(const std::string& user_email) override;
 
   // Signals delegate that authentication is completed, kicks off token fetching
   // process.
   void CompleteAuthentication();
 
   // Retrieves ProfileOAuth2TokenService for |user_profile_|.
   ProfileOAuth2TokenService* GetTokenService();
 
   // Retrieves the primary account for |user_profile_|.
   const std::string& GetPrimaryAccountId();
@@ skipping 69 matching lines @@
   // TODO(zelidrag|gspencer): Figure out how to get rid of ProfileHelper so we
   // can change the line below to base::ObserverList<Observer, true>.
   base::ObserverList<Observer, false> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(OAuth2LoginManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_OAUTH2_LOGIN_MANAGER_H_