This CL replaces user_manager::UserID with AccountId.

chrome/browser/extensions/crx_installer_browsertest.cc

 // Copyright (c) 2012 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/extensions/crx_installer.h"
 
 #include "base/at_exit.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 517 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, KioskOnlyTest) {
   base::FilePath crx_path =
       test_data_dir_.AppendASCII("kiosk/kiosk_only.crx");
   EXPECT_FALSE(InstallExtension(crx_path, 0));
 #if defined(OS_CHROMEOS)
   // Simulate ChromeOS kiosk mode. |scoped_user_manager| will take over
   // lifetime of |user_manager|.
   chromeos::FakeChromeUserManager* fake_user_manager =
       new chromeos::FakeChromeUserManager();
-  fake_user_manager->AddKioskAppUser("example@example.com");
-  fake_user_manager->LoginUser("example@example.com");
+  const AccountId account_id(AccountId::FromUserEmail("example@example.com"));
+  fake_user_manager->AddKioskAppUser(account_id);
+  fake_user_manager->LoginUser(account_id);
   chromeos::ScopedUserManagerEnabler scoped_user_manager(fake_user_manager);
   EXPECT_TRUE(InstallExtension(crx_path, 1));
 #endif
 }
 
 #if defined(OS_CHROMEOS)
 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, InstallToSharedLocation) {
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       chromeos::switches::kEnableExtensionAssetsSharing);
   base::ScopedTempDir cache_dir;
@@ skipping 41 matching lines @@
   ManagementPolicyMock policy;
   extensions::ExtensionSystem::Get(profile())
       ->management_policy()
       ->RegisterProvider(&policy);
 
   base::FilePath crx_path = test_data_dir_.AppendASCII("crx_installer/v1.crx");
   EXPECT_FALSE(InstallExtension(crx_path, 0));
 }
 
 }  // namespace extensions