This CL replaces user_manager::UserID with AccountId.

components/user_manager/empty_user_info.cc

Index: components/user_manager/empty_user_info.cc
diff --git a/components/user_manager/empty_user_info.cc b/components/user_manager/empty_user_info.cc
index ab886f179015a84314061afea70a2e6debf7ef6f..08d4a19f84512611c8c396ae56b71d5177bb719e 100644
--- a/components/user_manager/empty_user_info.cc
+++ b/components/user_manager/empty_user_info.cc
@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
+#include "components/signin/core/account_id/account_id.h"
 
 namespace user_manager {
 
@@ -30,9 +31,9 @@ std::string EmptyUserInfo::GetEmail() const {
   return std::string();
 }
 
-std::string EmptyUserInfo::GetUserID() const {
+AccountId EmptyUserInfo::GetAccountId() const {
   NOTIMPLEMENTED();
-  return std::string();
+  return EmptyAccountId();
 }
 
 const gfx::ImageSkia& EmptyUserInfo::GetImage() const {