This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/preferences_chromeos_browsertest.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 <sys/types.h>
 
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ skipping 23 matching lines @@
 namespace {
 
 const char* const kTestUsers[] = {"test-user1@gmail.com",
                                   "test-user2@gmail.com"};
 
 }  // namespace
 
 class PreferencesTest : public LoginManagerTest {
  public:
   PreferencesTest()
-      : LoginManagerTest(true),
-        input_settings_(NULL),
-        keyboard_(NULL) {}
+      : LoginManagerTest(true), input_settings_(NULL), keyboard_(NULL) {
+    for (size_t i = 0; i < arraysize(kTestUsers); ++i) {
+      test_users_.push_back(AccountId::FromUserEmail(kTestUsers[i]));
+    }
+  }
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     LoginManagerTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kStubCrosSettings);
   }
 
   void SetUpOnMainThread() override {
     LoginManagerTest::SetUpOnMainThread();
     input_settings_ = new system::FakeInputDeviceSettings();
     system::InputDeviceSettings::SetSettingsForTesting(input_settings_);
     keyboard_ = new input_method::FakeImeKeyboard();
     static_cast<input_method::InputMethodManagerImpl*>(
         input_method::InputMethodManager::Get())
         ->SetImeKeyboardForTesting(keyboard_);
-    CrosSettings::Get()->SetString(kDeviceOwner, kTestUsers[0]);
+    CrosSettings::Get()->SetString(kDeviceOwner, test_users_[0].GetUserEmail());
   }
 
   // Sets set of preferences in given |prefs|. Value of prefernece depends of
   // |variant| value. For opposite |variant| values all preferences receive
   // different values.
   void SetPrefs(PrefService* prefs, bool variant) {
     prefs->SetBoolean(prefs::kTapToClickEnabled, variant);
     prefs->SetBoolean(prefs::kPrimaryMouseButtonRight, !variant);
     prefs->SetBoolean(prefs::kTapDraggingEnabled, variant);
     prefs->SetBoolean(prefs::kEnableTouchpadThreeFingerClick, !variant);
@@ skipping 50 matching lines @@
 
   void DisableAnimations() {
     // Disable animations for user transitions.
     chrome::MultiUserWindowManagerChromeOS* manager =
         static_cast<chrome::MultiUserWindowManagerChromeOS*>(
             chrome::MultiUserWindowManager::GetInstance());
     manager->SetAnimationSpeedForTest(
         chrome::MultiUserWindowManagerChromeOS::ANIMATION_SPEED_DISABLED);
   }
 
+  std::vector<AccountId> test_users_;
+
  private:
   system::FakeInputDeviceSettings* input_settings_;
   input_method::FakeImeKeyboard* keyboard_;
 
   DISALLOW_COPY_AND_ASSIGN(PreferencesTest);
 };
 
 IN_PROC_BROWSER_TEST_F(PreferencesTest, PRE_MultiProfiles) {
-  RegisterUser(kTestUsers[0]);
-  RegisterUser(kTestUsers[1]);
+  RegisterUser(test_users_[0].GetUserEmail());
+  RegisterUser(test_users_[1].GetUserEmail());
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 
 IN_PROC_BROWSER_TEST_F(PreferencesTest, MultiProfiles) {
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
 
   // Add first user and init its preferences. Check that corresponding
   // settings has been changed.
-  LoginUser(kTestUsers[0]);
-  const user_manager::User* user1 = user_manager->FindUser(kTestUsers[0]);
+  LoginUser(test_users_[0].GetUserEmail());
+  const user_manager::User* user1 = user_manager->FindUser(test_users_[0]);
   PrefService* prefs1 =
       ProfileHelper::Get()->GetProfileByUserUnsafe(user1)->GetPrefs();
   SetPrefs(prefs1, false);
   content::RunAllPendingInMessageLoop();
   CheckSettingsCorrespondToPrefs(prefs1);
 
   // Add second user and init its prefs with different values.
   UserAddingScreen::Get()->Start();
   content::RunAllPendingInMessageLoop();
   DisableAnimations();
-  AddUser(kTestUsers[1]);
+  AddUser(test_users_[1].GetUserEmail());
   content::RunAllPendingInMessageLoop();
-  const user_manager::User* user2 = user_manager->FindUser(kTestUsers[1]);
+  const user_manager::User* user2 = user_manager->FindUser(test_users_[1]);
   EXPECT_TRUE(user2->is_active());
   PrefService* prefs2 =
       ProfileHelper::Get()->GetProfileByUserUnsafe(user2)->GetPrefs();
   SetPrefs(prefs2, true);
 
   // Check that settings were changed accordingly.
   EXPECT_TRUE(user2->is_active());
   CheckSettingsCorrespondToPrefs(prefs2);
 
   // Check that changing prefs of the active user doesn't affect prefs of the
@@ skipping 12 matching lines @@
   prefs_backup = prefs2->GetPreferenceValues();
   SetPrefs(prefs1, true);
   CheckSettingsCorrespondToPrefs(prefs2);
   EXPECT_TRUE(prefs_backup->Equals(prefs2->GetPreferenceValues().get()));
   SetPrefs(prefs1, false);
   CheckSettingsCorrespondToPrefs(prefs2);
   EXPECT_TRUE(prefs_backup->Equals(prefs2->GetPreferenceValues().get()));
 
   // Check that changing non-owner prefs doesn't change corresponding local
   // state prefs and vice versa.
-  EXPECT_EQ(user_manager->GetOwnerEmail(), kTestUsers[0]);
+  EXPECT_EQ(user_manager->GetOwnerAccountId(), test_users_[0]);
   CheckLocalStateCorrespondsToPrefs(prefs1);
   prefs2->SetBoolean(prefs::kTapToClickEnabled,
                      !prefs1->GetBoolean(prefs::kTapToClickEnabled));
   CheckLocalStateCorrespondsToPrefs(prefs1);
   prefs1->SetBoolean(prefs::kTapToClickEnabled,
                      !prefs1->GetBoolean(prefs::kTapToClickEnabled));
   CheckLocalStateCorrespondsToPrefs(prefs1);
 
   // Switch user back.
-  user_manager->SwitchActiveUser(kTestUsers[0]);
+  user_manager->SwitchActiveUser(test_users_[0]);
   CheckSettingsCorrespondToPrefs(prefs1);
   CheckLocalStateCorrespondsToPrefs(prefs1);
 }
 
 }  // namespace chromeos