This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/session/user_session_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_SESSION_USER_SESSION_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 #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"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "net/base/network_change_notifier.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 
+class AccountId;
 class GURL;
 class PrefRegistrySimple;
 class PrefService;
 class Profile;
 class TokenHandleFetcher;
 
 namespace net {
 class URLRequestContextGetter;
 }
 
@@ skipping 256 matching lines @@
   // Initializes basic preferences for newly created profile. Any other
   // early profile initialization that needs to happen before
   // ProfileManager::DoFinalInit() gets called is done here.
   void InitProfilePreferences(Profile* profile,
                               const UserContext& user_context);
 
   // Callback for Profile::CREATE_STATUS_INITIALIZED profile state.
   // Profile is created, extensions and promo resources are initialized.
   void UserProfileInitialized(Profile* profile,
                               bool is_incognito_profile,
-                              const std::string& user_id);
+                              const AccountId& account_id);
 
   // Callback to resume profile creation after transferring auth data from
   // the authentication profile.
   void CompleteProfileCreateAfterAuthTransfer(Profile* profile);
 
   // Finalized profile preparation.
   void FinalizePrepareProfile(Profile* profile);
 
   // Starts out-of-box flow with the specified screen.
   void ActivateWizard(const std::string& screen_name);
@@ skipping 47 matching lines @@
   void DoBrowserLaunchInternal(Profile* profile,
                                LoginDisplayHost* login_host,
                                bool locale_pref_checked);
 
   static void RunCallbackOnLocaleLoaded(
       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, bool success);
+  void OnTokenHandleObtained(const AccountId& account_id, bool success);
 
   // Returns |true| if token handles should be used on this device.
   bool TokenHandlesEnabled();
 
   void CreateTokenUtilIfMissing();
 
   // Test API methods.
 
   // Injects |user_context| that will be used to create StubAuthenticator
   // instance when CreateAuthenticator() is called.
@@ skipping 94 matching lines @@
   bool waiting_for_child_account_status_;
 
   base::WeakPtrFactory<UserSessionManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UserSessionManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_