This CL replaces user_manager::UserID with AccountId.

chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h

 // Copyright 2013 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_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
 #include "chromeos/network/portal_detector/network_portal_detector.h"
 #include "net/base/net_errors.h"
 
+class AccountId;
+
 namespace policy {
 class ConsumerManagementService;
 }
 
 namespace chromeos {
 
 class SigninScreenHandler;
 class SigninScreenHandlerDelegate;
 
 // A class that's used to specify the way how Gaia should be loaded.
@@ skipping 180 matching lines @@
   SigninScreenHandlerDelegate* Delegate();
 
   // Returns temporary unused device Id.
   std::string GetTemporaryDeviceId();
 
   FrameState frame_state() const { return frame_state_; }
   net::Error frame_error() const { return frame_error_; }
 
   // Returns user canonical e-mail. Finds already used account alias, if
   // user has already signed in.
-  std::string GetCanonicalEmail(const std::string& authenticated_email,
-                                const std::string& gaia_id) const;
+  AccountId GetAccountId(const std::string& authenticated_email,
+                         const std::string& gaia_id) const;
 
   // Current state of Gaia frame.
   FrameState frame_state_ = FRAME_STATE_UNKNOWN;
 
   // Latest Gaia frame error.
   net::Error frame_error_ = net::OK;
 
   // Network state informer used to keep signin screen up.
   scoped_refptr<NetworkStateInformer> network_state_informer_;
 
@@ skipping 53 matching lines @@
   SigninScreenHandler* signin_screen_handler_ = nullptr;
 
   base::WeakPtrFactory<GaiaScreenHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GaiaScreenHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_