This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

 // Copyright (c) 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.
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chromeos/chromeos_switches.h"
@@ skipping 591 matching lines @@
     return profile ? profile : FileManagerBrowserTestBase::profile();
   }
 
   // Sets the test case name (used as a function name in test_cases.js to call.)
   void set_test_case_name(const std::string& name) { test_case_name_ = name; }
 
   // Adds a new user for testing to the current session.
   void AddUser(const TestAccountInfo& info, bool log_in) {
     user_manager::UserManager* const user_manager =
         user_manager::UserManager::Get();
+    const AccountId account_id(AccountId::FromUserEmail(info.email));
     if (log_in)
-      user_manager->UserLoggedIn(info.email, info.hash, false);
-    user_manager->SaveUserDisplayName(info.email,
+      user_manager->UserLoggedIn(account_id, info.hash, false);
+    user_manager->SaveUserDisplayName(account_id,
                                       base::UTF8ToUTF16(info.display_name));
     SigninManagerFactory::GetForProfile(
         chromeos::ProfileHelper::GetProfileByUserIdHash(info.hash))
         ->SetAuthenticatedAccountInfo(info.gaia_id, info.email);
   }
 
  private:
   GuestMode GetGuestModeParam() const override { return NOT_IN_GUEST_MODE; }
   const char* GetTestManifestName() const override {
     return "file_manager_test_manifest.json";
@@ skipping 42 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, MAYBE_BasicDrive) {
   AddAllUsers();
 
   // Sanity check that normal operations work in multi-profile setting as well.
   set_test_case_name("keyboardCopyDrive");
   StartTest();
 }
 
 }  // namespace file_manager