This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/system/device_disabling_manager_unittest.cc

 // 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.
 
 #include "chrome/browser/chromeos/system/device_disabling_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
@@ skipping 94 matching lines @@
   policy::StubEnterpriseInstallAttributes* install_attributes =
       static_cast<policy::StubEnterpriseInstallAttributes*>(
           TestingBrowserProcess::GetGlobal()->platform_part()->
               browser_policy_connector_chromeos()->GetInstallAttributes());
   install_attributes->SetDomain(enrollment_domain);
   install_attributes->SetRegistrationUser(registration_user);
   install_attributes->SetMode(device_mode);
 }
 
 void DeviceDisablingManagerTestBase::LogIn() {
-  fake_user_manager_.AddUser(kTestUser);
+  fake_user_manager_.AddUser(AccountId::FromUserEmail(kTestUser));
 }
 
 // Base class for tests that verify device disabling behavior during OOBE, when
 // the device is not owned yet.
 class DeviceDisablingManagerOOBETest : public DeviceDisablingManagerTestBase {
  public:
   DeviceDisablingManagerOOBETest();
 
   // DeviceDisablingManagerTestBase:
   void SetUp() override;
@@ skipping 381 matching lines @@
       DeviceDisablingManager::HonorDeviceDisablingDuringNormalOperation());
 
   // Not enterprise owned, disabled by flag.
   SetUnowned();
   EXPECT_FALSE(
       DeviceDisablingManager::HonorDeviceDisablingDuringNormalOperation());
 }
 
 }  // namespace system
 }  // namespace chromeos