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

chrome/browser/chromeos/login/existing_user_controller_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 <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
@@ skipping 58 matching lines @@
 
 namespace chromeos {
 
 namespace {
 
 const char kGaiaID[] = "12345";
 const char kUsername[] = "test_user@gmail.com";
 const char kSupervisedUserID[] = "supervised_user@locally-managed.localhost";
 const char kPassword[] = "test_password";
 
-const char kPublicSessionUserEmail[] = "public_session_user@localhost";
+const char kPublicSessionAccountId[] = "public_session_user@localhost";
 const int kAutoLoginNoDelay = 0;
 const int kAutoLoginShortDelay = 1;
 const int kAutoLoginLongDelay = 10000;
 
 // Wait for cros settings to become permanently untrusted and run |callback|.
 void WaitForPermanentlyUntrustedStatusAndRun(const base::Closure& callback) {
   while (true) {
     const CrosSettingsProvider::TrustedStatus status =
         CrosSettings::Get()->PrepareTrustedValues(base::Bind(
             &WaitForPermanentlyUntrustedStatusAndRun,
             callback));
     switch (status) {
       case CrosSettingsProvider::PERMANENTLY_UNTRUSTED:
         callback.Run();
         return;
       case CrosSettingsProvider::TEMPORARILY_UNTRUSTED:
         return;
       case CrosSettingsProvider::TRUSTED:
         content::RunAllPendingInMessageLoop();
         break;
     }
   }
 }
 
 }  // namespace
 
 class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest {
  protected:
-  ExistingUserControllerTest() {}
+  ExistingUserControllerTest() : mock_login_display_(NULL) {}
 
   ExistingUserController* existing_user_controller() {
     return ExistingUserController::current_controller();
   }
 
   const ExistingUserController* existing_user_controller() const {
     return ExistingUserController::current_controller();
   }
 
   void SetUpInProcessBrowserTestFixture() override {
@@ skipping 70 matching lines @@
     ListPrefUpdate users_pref(g_browser_process->local_state(),
                               "LoggedInUsers");
     users_pref->AppendIfNotPresent(new base::StringValue(user_id));
   }
 
   // ExistingUserController private member accessors.
   base::OneShotTimer* auto_login_timer() {
     return existing_user_controller()->auto_login_timer_.get();
   }
 
-  AccountId auto_login_account_id() const {
-    return AccountId::FromUserEmail(
-        existing_user_controller()->public_session_auto_login_username_);
+  const std::string& auto_login_username() const {
+    return existing_user_controller()->public_session_auto_login_username_;
   }
 
   int auto_login_delay() const {
     return existing_user_controller()->public_session_auto_login_delay_;
   }
 
   bool is_login_in_progress() const {
     return existing_user_controller()->is_login_in_progress_;
   }
 
   scoped_ptr<ExistingUserController> existing_user_controller_;
 
   // |mock_login_display_| is owned by the ExistingUserController, which calls
   // CreateLoginDisplay() on the |mock_login_display_host_| to get it.
-  MockLoginDisplay* mock_login_display_ = nullptr;
+  MockLoginDisplay* mock_login_display_;
   scoped_ptr<MockLoginDisplayHost> mock_login_display_host_;
 
   // Mock URLFetcher.
   MockURLFetcherFactory<SuccessFetcher> factory_;
 
-  const AccountId account_id_ = AccountId::FromUserEmail(kUsername);
-
  private:
   DISALLOW_COPY_AND_ASSIGN(ExistingUserControllerTest);
 };
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, PRE_ExistingUserLogin) {
-  RegisterUser(account_id_.GetUserEmail());
+  RegisterUser(kUsername);
 }
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, ExistingUserLogin) {
   EXPECT_CALL(*mock_login_display_, SetUIEnabled(false))
       .Times(2);
-  UserContext user_context(account_id_);
+  UserContext user_context(kUsername);
   user_context.SetGaiaID(kGaiaID);
   user_context.SetKey(Key(kPassword));
-  user_context.SetUserIDHash(account_id_.GetUserEmail());
+  user_context.SetUserIDHash(kUsername);
   test::UserSessionManagerTestApi session_manager_test_api(
       UserSessionManager::GetInstance());
   session_manager_test_api.InjectStubUserContext(user_context);
   EXPECT_CALL(*mock_login_display_, SetUIEnabled(true))
       .Times(1);
   EXPECT_CALL(*mock_login_display_host_,
               StartWizard(WizardController::kTermsOfServiceScreenName))
       .Times(0);
 
   content::WindowedNotificationObserver profile_prepared_observer(
@@ skipping 27 matching lines @@
 
   ExpectLoginFailure();
 }
 
 void ExistingUserControllerUntrustedTest::SetUpSessionManager() {
   InstallOwnerKey();
 }
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerUntrustedTest,
                        ExistingUserLoginForbidden) {
-  UserContext user_context(account_id_);
+  UserContext user_context(kUsername);
   user_context.SetGaiaID(kGaiaID);
   user_context.SetKey(Key(kPassword));
-  user_context.SetUserIDHash(account_id_.GetUserEmail());
+  user_context.SetUserIDHash(kUsername);
   existing_user_controller()->Login(user_context, SigninSpecifics());
 }
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerUntrustedTest,
                        NewUserLoginForbidden) {
-  UserContext user_context(account_id_);
+  UserContext user_context(kUsername);
   user_context.SetGaiaID(kGaiaID);
   user_context.SetKey(Key(kPassword));
-  user_context.SetUserIDHash(account_id_.GetUserEmail());
+  user_context.SetUserIDHash(kUsername);
   existing_user_controller()->CompleteLogin(user_context);
 }
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerUntrustedTest,
                        GuestLoginForbidden) {
   existing_user_controller()->Login(
       UserContext(user_manager::USER_TYPE_GUEST, std::string()),
       SigninSpecifics());
 }
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerUntrustedTest,
                        SupervisedUserLoginForbidden) {
-  UserContext user_context(AccountId::FromUserEmail(kSupervisedUserID));
+  UserContext user_context(kSupervisedUserID);
   user_context.SetKey(Key(kPassword));
-  user_context.SetUserIDHash(account_id_.GetUserEmail());
+  user_context.SetUserIDHash(kUsername);
   existing_user_controller()->Login(user_context, SigninSpecifics());
 }
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerUntrustedTest,
                        SupervisedUserCreationForbidden) {
   MockBaseScreenDelegate mock_base_screen_delegate;
   SupervisedUserCreationScreenHandler supervised_user_creation_screen_handler;
   SupervisedUserCreationScreen supervised_user_creation_screen(
       &mock_base_screen_delegate, &supervised_user_creation_screen_handler);
 
-  supervised_user_creation_screen.AuthenticateManager(
-      account_id_.GetUserEmail(), kPassword);
+  supervised_user_creation_screen.AuthenticateManager(kUsername, kPassword);
 }
 
 MATCHER_P(HasDetails, expected, "") {
   return expected == *content::Details<const std::string>(arg).ptr();
 }
 
 class ExistingUserControllerPublicSessionTest
     : public ExistingUserControllerTest {
  protected:
-  ExistingUserControllerPublicSessionTest() {}
+  ExistingUserControllerPublicSessionTest()
+      : public_session_user_id_(policy::GenerateDeviceLocalAccountUserId(
+            kPublicSessionAccountId,
+            policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION)) {
+  }
 
   void SetUpOnMainThread() override {
     ExistingUserControllerTest::SetUpOnMainThread();
 
     // Wait for the public session user to be created.
     if (!user_manager::UserManager::Get()->IsKnownUser(
-            public_session_account_id_)) {
+            public_session_user_id_)) {
       content::WindowedNotificationObserver(
           chrome::NOTIFICATION_USER_LIST_CHANGED,
           base::Bind(&user_manager::UserManager::IsKnownUser,
                      base::Unretained(user_manager::UserManager::Get()),
-                     public_session_account_id_))
-          .Wait();
+                     public_session_user_id_)).Wait();
     }
 
     // Wait for the device local account policy to be installed.
     policy::CloudPolicyStore* store =
         TestingBrowserProcess::GetGlobal()
             ->platform_part()
             ->browser_policy_connector_chromeos()
             ->GetDeviceLocalAccountPolicyService()
-            ->GetBrokerForUser(public_session_account_id_.GetUserEmail())
+            ->GetBrokerForUser(public_session_user_id_)
             ->core()
             ->store();
     if (!store->has_policy()) {
       policy::MockCloudPolicyStoreObserver observer;
 
       base::RunLoop loop;
       store->AddObserver(&observer);
       EXPECT_CALL(observer, OnStoreLoaded(store))
           .Times(1)
           .WillOnce(InvokeWithoutArgs(&loop, &base::RunLoop::Quit));
       loop.Run();
       store->RemoveObserver(&observer);
     }
   }
 
   void SetUpSessionManager() override {
     InstallOwnerKey();
 
     // Setup the device policy.
     em::ChromeDeviceSettingsProto& proto(device_policy()->payload());
     em::DeviceLocalAccountInfoProto* account =
         proto.mutable_device_local_accounts()->add_account();
-    account->set_account_id(kPublicSessionUserEmail);
+    account->set_account_id(kPublicSessionAccountId);
     account->set_type(
         em::DeviceLocalAccountInfoProto::ACCOUNT_TYPE_PUBLIC_SESSION);
     RefreshDevicePolicy();
 
     // Setup the device local account policy.
     policy::UserPolicyBuilder device_local_account_policy;
     device_local_account_policy.policy_data().set_username(
-        kPublicSessionUserEmail);
+        kPublicSessionAccountId);
     device_local_account_policy.policy_data().set_policy_type(
         policy::dm_protocol::kChromePublicAccountPolicyType);
     device_local_account_policy.policy_data().set_settings_entity_id(
-        kPublicSessionUserEmail);
+        kPublicSessionAccountId);
     device_local_account_policy.Build();
     session_manager_client()->set_device_local_account_policy(
-        kPublicSessionUserEmail, device_local_account_policy.GetBlob());
+        kPublicSessionAccountId,
+        device_local_account_policy.GetBlob());
   }
 
   void SetUpLoginDisplay() override {
     EXPECT_CALL(*mock_login_display_host_.get(), CreateLoginDisplay(_))
         .Times(1)
         .WillOnce(Return(mock_login_display_));
     EXPECT_CALL(*mock_login_display_host_.get(), GetNativeWindow())
       .Times(AnyNumber())
       .WillRepeatedly(ReturnNull());
     EXPECT_CALL(*mock_login_display_host_.get(), OnPreferencesChanged())
@@ skipping 18 matching lines @@
     test::UserSessionManagerTestApi session_manager_test_api(
         UserSessionManager::GetInstance());
     session_manager_test_api.InjectStubUserContext(user_context);
     EXPECT_CALL(*mock_login_display_host_,
                 StartWizard(WizardController::kTermsOfServiceScreenName))
         .Times(0);
     EXPECT_CALL(*mock_login_display_, SetUIEnabled(false)).Times(AnyNumber());
     EXPECT_CALL(*mock_login_display_, SetUIEnabled(true)).Times(AnyNumber());
   }
 
-  void SetAutoLoginPolicy(const std::string& user_email, int delay) {
+  void SetAutoLoginPolicy(const std::string& username, int delay) {
     // Wait until ExistingUserController has finished auto-login
     // configuration by observing the same settings that trigger
     // ConfigurePublicSessionAutoLogin.
 
     em::ChromeDeviceSettingsProto& proto(device_policy()->payload());
 
     // If both settings have changed we need to wait for both to
     // propagate, so check the new values against the old ones.
     scoped_refptr<content::MessageLoopRunner> runner1;
     scoped_ptr<CrosSettings::ObserverSubscription> subscription1;
     if (!proto.has_device_local_accounts() ||
         !proto.device_local_accounts().has_auto_login_id() ||
-        proto.device_local_accounts().auto_login_id() != user_email) {
+        proto.device_local_accounts().auto_login_id() != username) {
       runner1 = new content::MessageLoopRunner;
       subscription1 = chromeos::CrosSettings::Get()->AddSettingsObserver(
           chromeos::kAccountsPrefDeviceLocalAccountAutoLoginId,
           runner1->QuitClosure());
     }
     scoped_refptr<content::MessageLoopRunner> runner2;
     scoped_ptr<CrosSettings::ObserverSubscription> subscription2;
     if (!proto.has_device_local_accounts() ||
         !proto.device_local_accounts().has_auto_login_delay() ||
         proto.device_local_accounts().auto_login_delay() != delay) {
       runner2 = new content::MessageLoopRunner;
       subscription2 = chromeos::CrosSettings::Get()->AddSettingsObserver(
           chromeos::kAccountsPrefDeviceLocalAccountAutoLoginDelay,
           runner2->QuitClosure());
     }
 
     // Update the policy.
-    proto.mutable_device_local_accounts()->set_auto_login_id(user_email);
+    proto.mutable_device_local_accounts()->set_auto_login_id(username);
     proto.mutable_device_local_accounts()->set_auto_login_delay(delay);
     RefreshDevicePolicy();
 
     // Wait for ExistingUserController to read the updated settings.
     if (runner1.get())
       runner1->Run();
     if (runner2.get())
       runner2->Run();
   }
 
   void ConfigureAutoLogin() {
     existing_user_controller()->ConfigurePublicSessionAutoLogin();
   }
 
   void FireAutoLogin() {
     existing_user_controller()->OnPublicSessionAutoLoginTimerFire();
   }
 
   void MakeCrosSettingsPermanentlyUntrusted() {
     device_policy()->policy().set_policy_data_signature("bad signature");
     session_manager_client()->set_device_policy(device_policy()->GetBlob());
     session_manager_client()->OnPropertyChangeComplete(true);
 
     base::RunLoop run_loop;
     WaitForPermanentlyUntrustedStatusAndRun(run_loop.QuitClosure());
     run_loop.Run();
   }
 
-  const AccountId public_session_account_id_ =
-      AccountId::FromUserEmail(policy::GenerateDeviceLocalAccountUserId(
-          kPublicSessionUserEmail,
-          policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION));
+  const std::string public_session_user_id_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ExistingUserControllerPublicSessionTest);
 };
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
                        ConfigureAutoLoginUsingPolicy) {
   existing_user_controller()->OnSigninScreenReady();
-  EXPECT_TRUE(!auto_login_account_id().is_valid());
+  EXPECT_EQ("", auto_login_username());
   EXPECT_EQ(0, auto_login_delay());
   EXPECT_FALSE(auto_login_timer());
 
   // Set the policy.
-  SetAutoLoginPolicy(kPublicSessionUserEmail, kAutoLoginLongDelay);
-  EXPECT_EQ(public_session_account_id_, auto_login_account_id());
+  SetAutoLoginPolicy(kPublicSessionAccountId, kAutoLoginLongDelay);
+  EXPECT_EQ(public_session_user_id_, auto_login_username());
   EXPECT_EQ(kAutoLoginLongDelay, auto_login_delay());
   ASSERT_TRUE(auto_login_timer());
   EXPECT_TRUE(auto_login_timer()->IsRunning());
 
   // Unset the policy.
   SetAutoLoginPolicy("", 0);
-  EXPECT_TRUE(!auto_login_account_id().is_valid());
+  EXPECT_EQ("", auto_login_username());
   EXPECT_EQ(0, auto_login_delay());
   ASSERT_TRUE(auto_login_timer());
   EXPECT_FALSE(auto_login_timer()->IsRunning());
 }
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
                        AutoLoginNoDelay) {
   // Set up mocks to check login success.
   UserContext user_context(user_manager::USER_TYPE_PUBLIC_ACCOUNT,
-                           public_session_account_id_.GetUserEmail());
-  user_context.SetUserIDHash(user_context.GetAccountId().GetUserEmail());
+                           public_session_user_id_);
+  user_context.SetUserIDHash(user_context.GetUserID());
   ExpectSuccessfulLogin(user_context);
   existing_user_controller()->OnSigninScreenReady();
 
   // Start auto-login and wait for login tasks to complete.
-  SetAutoLoginPolicy(kPublicSessionUserEmail, kAutoLoginNoDelay);
+  SetAutoLoginPolicy(kPublicSessionAccountId, kAutoLoginNoDelay);
   content::RunAllPendingInMessageLoop();
 }
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
                        AutoLoginShortDelay) {
   // Set up mocks to check login success.
   UserContext user_context(user_manager::USER_TYPE_PUBLIC_ACCOUNT,
-                           public_session_account_id_.GetUserEmail());
-  user_context.SetUserIDHash(user_context.GetAccountId().GetUserEmail());
+                           public_session_user_id_);
+  user_context.SetUserIDHash(user_context.GetUserID());
   ExpectSuccessfulLogin(user_context);
   existing_user_controller()->OnSigninScreenReady();
 
   content::WindowedNotificationObserver profile_prepared_observer(
       chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
       content::NotificationService::AllSources());
 
-  SetAutoLoginPolicy(kPublicSessionUserEmail, kAutoLoginShortDelay);
+  SetAutoLoginPolicy(kPublicSessionAccountId, kAutoLoginShortDelay);
   ASSERT_TRUE(auto_login_timer());
   // Don't assert that timer is running: with the short delay sometimes
   // the trigger happens before the assert.  We've already tested that
   // the timer starts when it should.
 
   // Wait for the timer to fire.
   base::RunLoop runner;
   base::OneShotTimer timer;
   timer.Start(FROM_HERE,
               base::TimeDelta::FromMilliseconds(kAutoLoginShortDelay + 1),
               runner.QuitClosure());
   runner.Run();
 
   profile_prepared_observer.Wait();
 
   // Wait for login tasks to complete.
   content::RunAllPendingInMessageLoop();
 }
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
                        LoginStopsAutoLogin) {
   // Set up mocks to check login success.
-  UserContext user_context(account_id_);
+  UserContext user_context(kUsername);
   user_context.SetGaiaID(kGaiaID);
   user_context.SetKey(Key(kPassword));
-  user_context.SetUserIDHash(user_context.GetAccountId().GetUserEmail());
+  user_context.SetUserIDHash(user_context.GetUserID());
   ExpectSuccessfulLogin(user_context);
 
   existing_user_controller()->OnSigninScreenReady();
-  SetAutoLoginPolicy(kPublicSessionUserEmail, kAutoLoginLongDelay);
+  SetAutoLoginPolicy(kPublicSessionAccountId, kAutoLoginLongDelay);
   EXPECT_TRUE(auto_login_timer());
 
   content::WindowedNotificationObserver profile_prepared_observer(
       chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
       content::NotificationService::AllSources());
 
   // Log in and check that it stopped the timer.
   existing_user_controller()->Login(user_context, SigninSpecifics());
   EXPECT_TRUE(is_login_in_progress());
   ASSERT_TRUE(auto_login_timer());
   EXPECT_FALSE(auto_login_timer()->IsRunning());
 
   profile_prepared_observer.Wait();
 
   // Wait for login tasks to complete.
   content::RunAllPendingInMessageLoop();
 
   // Timer should still be stopped after login completes.
   ASSERT_TRUE(auto_login_timer());
   EXPECT_FALSE(auto_login_timer()->IsRunning());
 }
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
                        GuestModeLoginStopsAutoLogin) {
   EXPECT_CALL(*mock_login_display_, SetUIEnabled(false))
       .Times(2);
-  UserContext user_context(account_id_);
+  UserContext user_context(kUsername);
   user_context.SetGaiaID(kGaiaID);
   user_context.SetKey(Key(kPassword));
   test::UserSessionManagerTestApi session_manager_test_api(
       UserSessionManager::GetInstance());
   session_manager_test_api.InjectStubUserContext(user_context);
 
   existing_user_controller()->OnSigninScreenReady();
-  SetAutoLoginPolicy(kPublicSessionUserEmail, kAutoLoginLongDelay);
+  SetAutoLoginPolicy(kPublicSessionAccountId, kAutoLoginLongDelay);
   EXPECT_TRUE(auto_login_timer());
 
   // Login and check that it stopped the timer.
   existing_user_controller()->Login(UserContext(user_manager::USER_TYPE_GUEST,
                                                 std::string()),
                                     SigninSpecifics());
   EXPECT_TRUE(is_login_in_progress());
   ASSERT_TRUE(auto_login_timer());
   EXPECT_FALSE(auto_login_timer()->IsRunning());
 
   // Wait for login tasks to complete.
   content::RunAllPendingInMessageLoop();
 
   // Timer should still be stopped after login completes.
   ASSERT_TRUE(auto_login_timer());
   EXPECT_FALSE(auto_login_timer()->IsRunning());
 }
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
                        CompleteLoginStopsAutoLogin) {
   // Set up mocks to check login success.
-  UserContext user_context(account_id_);
+  UserContext user_context(kUsername);
   user_context.SetGaiaID(kGaiaID);
   user_context.SetKey(Key(kPassword));
-  user_context.SetUserIDHash(user_context.GetAccountId().GetUserEmail());
+  user_context.SetUserIDHash(user_context.GetUserID());
   ExpectSuccessfulLogin(user_context);
   EXPECT_CALL(*mock_login_display_host_, OnCompleteLogin())
       .Times(1);
 
   existing_user_controller()->OnSigninScreenReady();
-  SetAutoLoginPolicy(kPublicSessionUserEmail, kAutoLoginLongDelay);
+  SetAutoLoginPolicy(kPublicSessionAccountId, kAutoLoginLongDelay);
   EXPECT_TRUE(auto_login_timer());
 
   content::WindowedNotificationObserver profile_prepared_observer(
       chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
       content::NotificationService::AllSources());
 
   // Check that login completes and stops the timer.
   existing_user_controller()->CompleteLogin(user_context);
   ASSERT_TRUE(auto_login_timer());
   EXPECT_FALSE(auto_login_timer()->IsRunning());
 
   profile_prepared_observer.Wait();
 
   // Wait for login tasks to complete.
   content::RunAllPendingInMessageLoop();
 
   // Timer should still be stopped after login completes.
   ASSERT_TRUE(auto_login_timer());
   EXPECT_FALSE(auto_login_timer()->IsRunning());
 }
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
                        PublicSessionLoginStopsAutoLogin) {
   // Set up mocks to check login success.
   UserContext user_context(user_manager::USER_TYPE_PUBLIC_ACCOUNT,
-                           public_session_account_id_.GetUserEmail());
-  user_context.SetUserIDHash(user_context.GetAccountId().GetUserEmail());
+                           public_session_user_id_);
+  user_context.SetUserIDHash(user_context.GetUserID());
   ExpectSuccessfulLogin(user_context);
   existing_user_controller()->OnSigninScreenReady();
-  SetAutoLoginPolicy(kPublicSessionUserEmail, kAutoLoginLongDelay);
+  SetAutoLoginPolicy(kPublicSessionAccountId, kAutoLoginLongDelay);
   EXPECT_TRUE(auto_login_timer());
 
   content::WindowedNotificationObserver profile_prepared_observer(
       chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
       content::NotificationService::AllSources());
 
   // Login and check that it stopped the timer.
   existing_user_controller()->Login(
       UserContext(user_manager::USER_TYPE_PUBLIC_ACCOUNT,
-                  public_session_account_id_.GetUserEmail()),
+                  public_session_user_id_),
       SigninSpecifics());
 
   EXPECT_TRUE(is_login_in_progress());
   ASSERT_TRUE(auto_login_timer());
   EXPECT_FALSE(auto_login_timer()->IsRunning());
 
   profile_prepared_observer.Wait();
 
   // Wait for login tasks to complete.
   content::RunAllPendingInMessageLoop();
 
   // Timer should still be stopped after login completes.
   ASSERT_TRUE(auto_login_timer());
   EXPECT_FALSE(auto_login_timer()->IsRunning());
 }
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
                        LoginForbiddenWhenUntrusted) {
   // Make cros settings untrusted.
   MakeCrosSettingsPermanentlyUntrusted();
 
   // Check that the attempt to start a public session fails with an error.
   ExpectLoginFailure();
-  UserContext user_context(account_id_);
+  UserContext user_context(kUsername);
   user_context.SetGaiaID(kGaiaID);
   user_context.SetKey(Key(kPassword));
-  user_context.SetUserIDHash(user_context.GetAccountId().GetUserEmail());
+  user_context.SetUserIDHash(user_context.GetUserID());
   existing_user_controller()->Login(user_context, SigninSpecifics());
 }
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
                        NoAutoLoginWhenUntrusted) {
   // Start the public session timer.
-  SetAutoLoginPolicy(kPublicSessionUserEmail, kAutoLoginLongDelay);
+  SetAutoLoginPolicy(kPublicSessionAccountId, kAutoLoginLongDelay);
   existing_user_controller()->OnSigninScreenReady();
   EXPECT_TRUE(auto_login_timer());
 
   // Make cros settings untrusted.
   MakeCrosSettingsPermanentlyUntrusted();
 
   // Check that when the timer fires, auto-login fails with an error.
   ExpectLoginFailure();
   FireAutoLogin();
 }
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
                        PRE_TestLoadingPublicUsersFromLocalState) {
   // First run propagates public accounts and stores them in Local State.
 }
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
                        TestLoadingPublicUsersFromLocalState) {
   // Second run loads list of public accounts from Local State.
 }
 
 }  // namespace chromeos