This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/preferences_unittest.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/chromeos/preferences.h"
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/prefs/pref_member.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 137 matching lines @@
     profile_manager_.reset(
         new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
     ASSERT_TRUE(profile_manager_->SetUp());
 
     chromeos::FakeChromeUserManager* user_manager =
         new chromeos::FakeChromeUserManager();
     user_manager_enabler_.reset(
         new chromeos::ScopedUserManagerEnabler(user_manager));
 
     const char test_user_email[] = "test_user@example.com";
-    test_user_ = user_manager->AddUser(test_user_email);
-    user_manager->LoginUser(test_user_email);
-    user_manager->SwitchActiveUser(test_user_email);
+    const AccountId test_account_id(AccountId::FromUserEmail(test_user_email));
+    test_user_ = user_manager->AddUser(test_account_id);
+    user_manager->LoginUser(test_account_id);
+    user_manager->SwitchActiveUser(test_account_id);
 
     test_profile_ = profile_manager_->CreateTestingProfile(
         chrome::kInitialProfile);
     pref_service_ = test_profile_->GetTestingPrefService();
 
     previous_input_method_.Init(
         prefs::kLanguagePreviousInputMethod, pref_service_);
     previous_input_method_.SetValue("KeyboardA");
     current_input_method_.Init(
         prefs::kLanguageCurrentInputMethod, pref_service_);
@@ skipping 527 matching lines @@
         "Syncable values should have added local values on initialization.");
     ExpectGlobalValues(
         "es,en-US",
         "xkb:es::spa,xkb:us::eng,xkb:ru::rus,xkb:xy::xyz," +
             ToInputMethodIds("xkb:jp::jpn"),
         std::string(kIdentityIMEID) + "," + kUnknownIMEID);
   }
 }
 
 }  // namespace chromeos