Revert of This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/input_method/input_method_persistence_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/input_method/input_method_persistence.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
 #include "chrome/browser/chromeos/language_preferences.h"
@@ skipping 25 matching lines @@
  protected:
   InputMethodPersistenceTest()
       : mock_profile_manager_(TestingBrowserProcess::GetGlobal()),
         fake_user_manager_(new chromeos::FakeChromeUserManager()),
         user_manager_enabler_(fake_user_manager_) {}
 
   void SetUp() override {
     ASSERT_TRUE(mock_profile_manager_.SetUp());
 
     // Add a user.
-    const AccountId test_account_id(
-        AccountId::FromUserEmail("test-user@example.com"));
-    fake_user_manager_->AddUser(test_account_id);
-    fake_user_manager_->LoginUser(test_account_id);
+    const char kTestUserName[] = "test-user@example.com";
+    fake_user_manager_->AddUser(kTestUserName);
+    fake_user_manager_->LoginUser(kTestUserName);
 
     // Create a valid profile for the user.
-    TestingProfile* mock_profile = mock_profile_manager_.CreateTestingProfile(
-        test_account_id.GetUserEmail());
+    TestingProfile* mock_profile =
+        mock_profile_manager_.CreateTestingProfile(kTestUserName);
     mock_profile_manager_.SetLoggedIn(true);
     EXPECT_TRUE(ProfileManager::GetActiveUserProfile() == mock_profile);
 
     mock_user_prefs_ = mock_profile->GetTestingPrefService();
   }
 
   // Verifies that the user and system prefs contain the expected values.
   void VerifyPrefs(const std::string& current_input_method,
                    const std::string& previous_input_method,
                    const std::string& preferred_keyboard_layout) {
@@ skipping 57 matching lines @@
 
   persistence.OnSessionStateChange(InputMethodManager::STATE_BROWSER_SCREEN);
   mock_manager_.SetCurrentInputMethodId(kInputId1);
   persistence.InputMethodChanged(&mock_manager_,
                                  ProfileManager::GetActiveUserProfile(), false);
   VerifyPrefs(kInputId1, kInputId2, kInputId2);
 }
 
 }  // namespace input_method
 }  // namespace chromeos