This CL replaces user_manager::UserID with AccountId.

components/user_manager/BUILD.gn

 # 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.
 
 component("user_manager") {
   sources = [
     "empty_user_info.cc",
     "empty_user_info.h",
-    "user_id.h",
     "user_info.cc",
     "user_info.h",
     "user_info_impl.cc",
     "user_info_impl.h",
     "user_manager_export.h",
   ]
 
   deps = [
     "//base",
+    "//components/signin/core/account_id",
     "//skia",
     "//ui/gfx",
   ]
 
   defines = [ "USER_MANAGER_IMPLEMENTATION" ]
 
   if (is_chromeos) {
     sources += [
       "remove_user_delegate.h",
       "user.cc",
@@ skipping 24 matching lines @@
 source_set("test_support") {
   testonly = true
   if (is_chromeos) {
     sources = [
       "fake_user_manager.cc",
       "fake_user_manager.h",
     ]
     deps = [
       ":user_manager",
       "//base",
+      "//components/signin/core/account_id",
       "//skia",
       "//ui/base",
     ]
   }
 }