This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/policy/device_local_account_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 <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "ash/shell.h"
@@ skipping 401 matching lines @@
 }
 
 }  // namespace
 
 class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
                                public user_manager::UserManager::Observer,
                                public chrome::BrowserListObserver,
                                public extensions::AppWindowRegistry::Observer {
  protected:
   DeviceLocalAccountTest()
-      : user_id_1_(GenerateDeviceLocalAccountUserId(
-            kAccountId1, DeviceLocalAccount::TYPE_PUBLIC_SESSION)),
-        user_id_2_(GenerateDeviceLocalAccountUserId(
-            kAccountId2, DeviceLocalAccount::TYPE_PUBLIC_SESSION)),
-        public_session_input_method_id_(base::StringPrintf(
-            kPublicSessionInputMethodIDTemplate,
-            chromeos::extension_ime_util::kXkbExtensionId)),
+      : public_session_input_method_id_(
+            base::StringPrintf(kPublicSessionInputMethodIDTemplate,
+                               chromeos::extension_ime_util::kXkbExtensionId)),
         contents_(NULL) {
     set_exit_when_last_browser_closes(false);
   }
 
   ~DeviceLocalAccountTest() override {}
 
   void SetUp() override {
     // Configure and start the test server.
     scoped_ptr<crypto::RSAPrivateKey> signing_key(
         PolicyBuilder::CreateTestSigningKey());
@@ skipping 188 matching lines @@
     em::DeviceLocalAccountsProto* device_local_accounts =
         proto.mutable_device_local_accounts();
     device_local_accounts->set_auto_login_id(kAccountId1);
     device_local_accounts->set_auto_login_delay(0);
     RefreshDevicePolicy();
     ASSERT_TRUE(test_server_.UpdatePolicy(dm_protocol::kChromeDevicePolicyType,
                                           std::string(),
                                           proto.SerializeAsString()));
   }
 
-  void CheckPublicSessionPresent(const std::string& id) {
+  void CheckPublicSessionPresent(const AccountId& account_id) {
     const user_manager::User* user =
-        user_manager::UserManager::Get()->FindUser(id);
+        user_manager::UserManager::Get()->FindUser(account_id);
     ASSERT_TRUE(user);
-    EXPECT_EQ(id, user->email());
+    EXPECT_EQ(account_id, user->GetAccountId());
     EXPECT_EQ(user_manager::USER_TYPE_PUBLIC_ACCOUNT, user->GetType());
   }
 
   base::FilePath GetExtensionCacheDirectoryForAccountID(
       const std::string& account_id) {
     base::FilePath extension_cache_root_dir;
     if (!PathService::Get(chromeos::DIR_DEVICE_LOCAL_ACCOUNT_EXTENSIONS,
                           &extension_cache_root_dir)) {
       ADD_FAILURE();
     }
@@ skipping 25 matching lines @@
                           const std::string& expected_display_name) {
     DictionaryPrefValueWaiter("UserDisplayName",
                               user_id,
                               expected_display_name).Wait();
   }
 
   void WaitForPolicy() {
     // Wait for the display name becoming available as that indicates
     // device-local account policy is fully loaded, which is a prerequisite for
     // successful login.
-    WaitForDisplayName(user_id_1_, kDisplayName1);
+    WaitForDisplayName(account_id_1_.GetUserEmail(), kDisplayName1);
   }
 
   void ExpandPublicSessionPod(bool expect_advanced) {
     bool advanced = false;
     // Click on the pod to expand it.
     ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
         contents_,
         base::StringPrintf(
             "var pod ="
             "    document.getElementById('pod-row').getPodWithUsername_('%s');"
             "pod.click();"
             "domAutomationController.send(pod.classList.contains('advanced'));",
-            user_id_1_.c_str()),
+            account_id_1_.GetUserEmail().c_str()),
         &advanced));
     // Verify that the pod expanded to its basic/advanced form, as expected.
     EXPECT_EQ(expect_advanced, advanced);
 
     // Verify that the construction of the pod's language list did not affect
     // the current ICU locale.
     EXPECT_EQ(initial_language_, icu::Locale::getDefault().getLanguage());
   }
 
   // GetKeyboardLayoutsForLocale() posts a task to a background task runner.
@@ skipping 23 matching lines @@
     chromeos::LoginDisplayHostImpl* host =
         reinterpret_cast<chromeos::LoginDisplayHostImpl*>(
             chromeos::LoginDisplayHostImpl::default_host());
     ASSERT_TRUE(host);
     host->StartSignInScreen(LoginScreenContext());
     chromeos::ExistingUserController* controller =
         chromeos::ExistingUserController::current_controller();
     ASSERT_TRUE(controller);
 
     chromeos::UserContext user_context(user_manager::USER_TYPE_PUBLIC_ACCOUNT,
-                                       user_id_1_);
+                                       account_id_1_.GetUserEmail());
     user_context.SetPublicSessionLocale(locale);
     user_context.SetPublicSessionInputMethod(input_method);
     controller->Login(user_context, chromeos::SigninSpecifics());
   }
 
   void WaitForSessionStart() {
     if (IsSessionStarted())
       return;
     content::WindowedNotificationObserver(chrome::NOTIFICATION_SESSION_STARTED,
                                           base::Bind(IsSessionStarted)).Wait();
@@ skipping 25 matching lines @@
     WaitForPolicy();
 
     WaitForSessionStart();
 
     EXPECT_EQ(locales[0], g_browser_process->GetApplicationLocale());
     EXPECT_EQ(l10n_util::GetLanguage(locales[0]),
               icu::Locale::getDefault().getLanguage());
     VerifyKeyboardLayoutMatchesLocale();
   }
 
-  const std::string user_id_1_;
-  const std::string user_id_2_;
+  const AccountId account_id_1_ =
+      AccountId::FromUserEmail(GenerateDeviceLocalAccountUserId(
+          kAccountId1,
+          DeviceLocalAccount::TYPE_PUBLIC_SESSION));
+  const AccountId account_id_2_ =
+      AccountId::FromUserEmail(GenerateDeviceLocalAccountUserId(
+          kAccountId2,
+          DeviceLocalAccount::TYPE_PUBLIC_SESSION));
   const std::string public_session_input_method_id_;
 
   std::string initial_locale_;
   std::string initial_language_;
 
   scoped_ptr<base::RunLoop> run_loop_;
 
   UserPolicyBuilder device_local_account_policy_;
   LocalPolicyTestServer test_server_;
 
   content::WebContents* contents_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DeviceLocalAccountTest);
 };
 
-static bool IsKnownUser(const std::string& account_id) {
+static bool IsKnownUser(const AccountId& account_id) {
   return user_manager::UserManager::Get()->IsKnownUser(account_id);
 }
 
 IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, LoginScreen) {
   AddPublicSessionToDevicePolicy(kAccountId1);
   AddPublicSessionToDevicePolicy(kAccountId2);
 
   content::WindowedNotificationObserver(chrome::NOTIFICATION_USER_LIST_CHANGED,
-                                        base::Bind(&IsKnownUser, user_id_1_))
+                                        base::Bind(&IsKnownUser, account_id_1_))
       .Wait();
-  EXPECT_TRUE(IsKnownUser(user_id_2_));
+  EXPECT_TRUE(IsKnownUser(account_id_2_));
 
-  CheckPublicSessionPresent(user_id_1_);
-  CheckPublicSessionPresent(user_id_2_);
+  CheckPublicSessionPresent(account_id_1_);
+  CheckPublicSessionPresent(account_id_2_);
 }
 
 // Flaky: http://crbug.com/512670.
 IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_DisplayName) {
   UploadAndInstallDeviceLocalAccountPolicy();
   AddPublicSessionToDevicePolicy(kAccountId1);
 
   WaitForPolicy();
 
   // Verify that the display name is shown in the UI.
   const std::string get_compact_pod_display_name = base::StringPrintf(
       "domAutomationController.send(document.getElementById('pod-row')"
       "    .getPodWithUsername_('%s').nameElement.textContent);",
-      user_id_1_.c_str());
+      account_id_1_.GetUserEmail().c_str());
   std::string display_name;
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       contents_,
       get_compact_pod_display_name,
       &display_name));
   EXPECT_EQ(kDisplayName1, display_name);
   const std::string get_expanded_pod_display_name = base::StringPrintf(
       "domAutomationController.send(document.getElementById('pod-row')"
       "    .getPodWithUsername_('%s').querySelector('.expanded-pane-name')"
       "        .textContent);",
-      user_id_1_.c_str());
+      account_id_1_.GetUserEmail().c_str());
   display_name.clear();
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       contents_,
       get_expanded_pod_display_name,
       &display_name));
   EXPECT_EQ(kDisplayName1, display_name);
 
   // Click on the pod to expand it.
   ASSERT_TRUE(content::ExecuteScript(
       contents_,
       base::StringPrintf(
           "document.getElementById('pod-row').getPodWithUsername_('%s')"
           "    .click();",
-      user_id_1_.c_str())));
+          account_id_1_.GetUserEmail().c_str())));
 
   // Change the display name.
   device_local_account_policy_.payload().mutable_userdisplayname()->set_value(
       kDisplayName2);
   UploadAndInstallDeviceLocalAccountPolicy();
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   DeviceLocalAccountPolicyBroker* broker =
       connector->GetDeviceLocalAccountPolicyService()->GetBrokerForUser(
-          user_id_1_);
+          account_id_1_.GetUserEmail());
   ASSERT_TRUE(broker);
   broker->core()->store()->Load();
-  WaitForDisplayName(user_id_1_, kDisplayName2);
+  WaitForDisplayName(account_id_1_.GetUserEmail(), kDisplayName2);
 
   // Verify that the new display name is shown in the UI.
   display_name.clear();
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       contents_,
       get_compact_pod_display_name,
       &display_name));
   EXPECT_EQ(kDisplayName2, display_name);
   display_name.clear();
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       contents_,
       get_expanded_pod_display_name,
       &display_name));
   EXPECT_EQ(kDisplayName2, display_name);
 
   // Verify that the pod is still expanded. This indicates that the UI updated
   // without reloading and losing state.
   bool expanded = false;
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       contents_,
       base::StringPrintf(
           "domAutomationController.send(document.getElementById('pod-row')"
           "    .getPodWithUsername_('%s').expanded);",
-          user_id_1_.c_str()),
+          account_id_1_.GetUserEmail().c_str()),
       &expanded));
   EXPECT_TRUE(expanded);
 }
 
 IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, PolicyDownload) {
   UploadDeviceLocalAccountPolicy();
   AddPublicSessionToDevicePolicy(kAccountId1);
 
   WaitForPolicy();
 
   // Sanity check: The policy should be present now.
   ASSERT_FALSE(session_manager_client()->device_local_account_policy(
       kAccountId1).empty());
 }
 
-static bool IsNotKnownUser(const std::string& account_id) {
+static bool IsNotKnownUser(const AccountId& account_id) {
   return !IsKnownUser(account_id);
 }
 
 IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, AccountListChange) {
   AddPublicSessionToDevicePolicy(kAccountId1);
   AddPublicSessionToDevicePolicy(kAccountId2);
 
   content::WindowedNotificationObserver(chrome::NOTIFICATION_USER_LIST_CHANGED,
-                                        base::Bind(&IsKnownUser, user_id_1_))
+                                        base::Bind(&IsKnownUser, account_id_1_))
       .Wait();
-  EXPECT_TRUE(IsKnownUser(user_id_2_));
+  EXPECT_TRUE(IsKnownUser(account_id_2_));
 
   // Update policy to remove kAccountId2.
   em::ChromeDeviceSettingsProto& proto(device_policy()->payload());
   proto.mutable_device_local_accounts()->clear_account();
   AddPublicSessionToDevicePolicy(kAccountId1);
 
   em::ChromeDeviceSettingsProto policy;
   policy.mutable_show_user_names()->set_show_user_names(true);
   em::DeviceLocalAccountInfoProto* account1 =
       policy.mutable_device_local_accounts()->add_account();
   account1->set_account_id(kAccountId1);
   account1->set_type(
       em::DeviceLocalAccountInfoProto::ACCOUNT_TYPE_PUBLIC_SESSION);
 
   test_server_.UpdatePolicy(dm_protocol::kChromeDevicePolicyType, std::string(),
                             policy.SerializeAsString());
   g_browser_process->policy_service()->RefreshPolicies(base::Closure());
 
   // Make sure the second device-local account disappears.
-  content::WindowedNotificationObserver(chrome::NOTIFICATION_USER_LIST_CHANGED,
-                                        base::Bind(&IsNotKnownUser, user_id_2_))
+  content::WindowedNotificationObserver(
+      chrome::NOTIFICATION_USER_LIST_CHANGED,
+      base::Bind(&IsNotKnownUser, account_id_2_))
       .Wait();
 }
 
 IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, StartSession) {
   // Specify startup pages.
   device_local_account_policy_.payload().mutable_restoreonstartup()->set_value(
       SessionStartupPref::kPrefValueURLs);
   em::StringListPolicyProto* startup_urls_proto =
       device_local_account_policy_.payload().mutable_restoreonstartupurls();
   for (size_t i = 0; i < arraysize(kStartupURLs); ++i)
@@ skipping 114 matching lines @@
   // Verify that the app was downloaded to the account's extension cache.
   base::FilePath test_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
   EXPECT_TRUE(ContentsEqual(
           GetCacheCRXFile(kAccountId1, kHostedAppID, kHostedAppVersion),
           test_dir.Append(kHostedAppCRXPath)));
 
   // Verify that the extension was removed from the account's extension cache
   // after the installation failure.
   DeviceLocalAccountPolicyBroker* broker =
-      g_browser_process->platform_part()->browser_policy_connector_chromeos()->
-          GetDeviceLocalAccountPolicyService()->GetBrokerForUser(user_id_1_);
+      g_browser_process->platform_part()
+          ->browser_policy_connector_chromeos()
+          ->GetDeviceLocalAccountPolicyService()
+          ->GetBrokerForUser(account_id_1_.GetUserEmail());
   ASSERT_TRUE(broker);
   chromeos::ExternalCache* cache =
       broker->extension_loader()->GetExternalCacheForTesting();
   ASSERT_TRUE(cache);
   EXPECT_FALSE(cache->GetExtension(kGoodExtensionID, NULL, NULL));
 }
 
 IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, ExtensionsCached) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
@@ skipping 51 matching lines @@
   EXPECT_TRUE(extension_service->GetExtensionById(kHostedAppID, true));
 
   // Verify that the extension was not installed.
   EXPECT_FALSE(extension_service->GetExtensionById(kGoodExtensionID, true));
 
   // Verify that the app is still in the account's extension cache.
   EXPECT_TRUE(PathExists(cached_hosted_app));
 
   // Verify that the extension was removed from the account's extension cache.
   DeviceLocalAccountPolicyBroker* broker =
-      g_browser_process->platform_part()->browser_policy_connector_chromeos()->
-          GetDeviceLocalAccountPolicyService()->GetBrokerForUser(user_id_1_);
+      g_browser_process->platform_part()
+          ->browser_policy_connector_chromeos()
+          ->GetDeviceLocalAccountPolicyService()
+          ->GetBrokerForUser(account_id_1_.GetUserEmail());
   ASSERT_TRUE(broker);
   chromeos::ExternalCache* cache =
       broker->extension_loader()->GetExternalCacheForTesting();
   ASSERT_TRUE(cache);
   EXPECT_FALSE(cache->GetExtension(kGoodExtensionID, NULL, NULL));
 }
 
 static void OnPutExtension(scoped_ptr<base::RunLoop>* run_loop,
                     const base::FilePath& file_path,
                     bool file_ownership_passed) {
@@ skipping 138 matching lines @@
       test::ConstructExternalDataReference(kExternalDataURL, kExternalData);
   std::string policy;
   base::JSONWriter::Write(*metadata, &policy);
   device_local_account_policy_.payload().mutable_useravatarimage()->set_value(
       policy);
   UploadAndInstallDeviceLocalAccountPolicy();
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   DeviceLocalAccountPolicyBroker* broker =
       connector->GetDeviceLocalAccountPolicyService()->GetBrokerForUser(
-          user_id_1_);
+          account_id_1_.GetUserEmail());
   ASSERT_TRUE(broker);
   broker->core()->store()->Load();
 
   // The external data should be fetched and cached automatically. Wait for this
   // fetch.
   run_loop->Run();
 
   // Stop serving external data at |kExternalDataURL|.
   fetcher_factory.reset();
 
@@ skipping 69 matching lines @@
               .spec(),
           image_data),
       &policy);
   device_local_account_policy_.payload().mutable_useravatarimage()->set_value(
       policy);
   UploadAndInstallDeviceLocalAccountPolicy();
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   DeviceLocalAccountPolicyBroker* broker =
       connector->GetDeviceLocalAccountPolicyService()->GetBrokerForUser(
-          user_id_1_);
+          account_id_1_.GetUserEmail());
   ASSERT_TRUE(broker);
 
   run_loop_.reset(new base::RunLoop);
   user_manager::UserManager::Get()->AddObserver(this);
   broker->core()->store()->Load();
   run_loop_->Run();
   user_manager::UserManager::Get()->RemoveObserver(this);
 
   scoped_ptr<gfx::ImageSkia> policy_image = chromeos::test::ImageLoader(
       test_dir.Append(chromeos::test::kUserAvatarImage1RelativePath)).Load();
   ASSERT_TRUE(policy_image);
 
   const user_manager::User* user =
-      user_manager::UserManager::Get()->FindUser(user_id_1_);
+      user_manager::UserManager::Get()->FindUser(account_id_1_);
   ASSERT_TRUE(user);
 
   base::FilePath user_data_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
   const base::FilePath saved_image_path =
-      user_data_dir.Append(user_id_1_).AddExtension("jpg");
+      user_data_dir.Append(account_id_1_.GetUserEmail()).AddExtension("jpg");
 
   EXPECT_FALSE(user->HasDefaultImage());
   EXPECT_EQ(user_manager::User::USER_IMAGE_EXTERNAL, user->image_index());
   EXPECT_TRUE(chromeos::test::AreImagesEqual(*policy_image, user->GetImage()));
   const base::DictionaryValue* images_pref =
       g_browser_process->local_state()->GetDictionary("user_image_info");
   ASSERT_TRUE(images_pref);
   const base::DictionaryValue* image_properties;
   ASSERT_TRUE(images_pref->GetDictionaryWithoutPathExpansion(
-      user_id_1_,
-      &image_properties));
+      account_id_1_.GetUserEmail(), &image_properties));
   int image_index;
   std::string image_path;
   ASSERT_TRUE(image_properties->GetInteger("index", &image_index));
   ASSERT_TRUE(image_properties->GetString("path", &image_path));
   EXPECT_EQ(user_manager::User::USER_IMAGE_EXTERNAL, image_index);
   EXPECT_EQ(saved_image_path.value(), image_path);
 
   scoped_ptr<gfx::ImageSkia> saved_image =
       chromeos::test::ImageLoader(saved_image_path).Load();
   ASSERT_TRUE(saved_image);
@@ skipping 165 matching lines @@
   WaitForPolicy();
 
   ExpandPublicSessionPod(false);
 
   // Click the enter button to start the session.
   ASSERT_TRUE(content::ExecuteScript(
       contents_,
       base::StringPrintf(
           "document.getElementById('pod-row').getPodWithUsername_('%s')"
           "    .querySelector('.enter-button').click();",
-          user_id_1_.c_str())));
+          account_id_1_.GetUserEmail().c_str())));
 
   WaitForSessionStart();
 
   // Verify that the locale has not changed and the first keyboard layout
   // applicable to the locale was chosen.
   EXPECT_EQ(initial_locale_, g_browser_process->GetApplicationLocale());
   EXPECT_EQ(initial_language_, icu::Locale::getDefault().getLanguage());
   VerifyKeyboardLayoutMatchesLocale();
 }
 
 IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, NoRecommendedLocaleSwitch) {
   UploadAndInstallDeviceLocalAccountPolicy();
   AddPublicSessionToDevicePolicy(kAccountId1);
 
   WaitForPolicy();
 
   ExpandPublicSessionPod(false);
 
   // Click the link that switches the pod to its advanced form. Verify that the
   // pod switches from basic to advanced.
   bool advanced = false;
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       contents_,
       base::StringPrintf(
           "var pod ="
           "    document.getElementById('pod-row').getPodWithUsername_('%s');"
           "pod.querySelector('.language-and-input').click();"
           "domAutomationController.send(pod.classList.contains('advanced'));",
-          user_id_1_.c_str()),
+          account_id_1_.GetUserEmail().c_str()),
       &advanced));
   EXPECT_FALSE(advanced);
 
   // Manually select a different locale.
   ASSERT_TRUE(content::ExecuteScript(
       contents_,
       base::StringPrintf(
           "var languageSelect = document.getElementById('pod-row')"
           "    .getPodWithUsername_('%s').querySelector('.language-select');"
           "languageSelect.value = '%s';"
           "var event = document.createEvent('HTMLEvents');"
           "event.initEvent('change', false, true);"
           "languageSelect.dispatchEvent(event);",
-          user_id_1_.c_str(),
-          kPublicSessionLocale)));
+          account_id_1_.GetUserEmail().c_str(), kPublicSessionLocale)));
 
   // The UI will have requested an updated list of keyboard layouts at this
   // point. Wait for the constructions of this list to finish.
   WaitForGetKeyboardLayoutsForLocaleToFinish();
 
   // Manually select a different keyboard layout and click the enter button to
   // start the session.
   ASSERT_TRUE(content::ExecuteScript(
       contents_,
       base::StringPrintf(
           "var pod ="
           "    document.getElementById('pod-row').getPodWithUsername_('%s');"
           "pod.querySelector('.keyboard-select').value = '%s';"
           "pod.querySelector('.enter-button').click();",
-          user_id_1_.c_str(),
+          account_id_1_.GetUserEmail().c_str(),
           public_session_input_method_id_.c_str())));
 
   WaitForSessionStart();
 
   // Verify that the locale and keyboard layout have been applied.
   EXPECT_EQ(kPublicSessionLocale, g_browser_process->GetApplicationLocale());
   EXPECT_EQ(l10n_util::GetLanguage(kPublicSessionLocale),
             icu::Locale::getDefault().getLanguage());
   EXPECT_EQ(public_session_input_method_id_,
             chromeos::input_method::InputMethodManager::Get()
@@ skipping 12 matching lines @@
   WaitForPolicy();
 
   ExpandPublicSessionPod(false);
 
   // Click the enter button to start the session.
   ASSERT_TRUE(content::ExecuteScript(
       contents_,
       base::StringPrintf(
           "document.getElementById('pod-row').getPodWithUsername_('%s')"
           "    .querySelector('.enter-button').click();",
-          user_id_1_.c_str())));
+          account_id_1_.GetUserEmail().c_str())));
 
   WaitForSessionStart();
 
   // Verify that the recommended locale has been applied and the first keyboard
   // layout applicable to the locale was chosen.
   EXPECT_EQ(kSingleRecommendedLocale[0],
             g_browser_process->GetApplicationLocale());
   EXPECT_EQ(l10n_util::GetLanguage(kSingleRecommendedLocale[0]),
             icu::Locale::getDefault().getLanguage());
   VerifyKeyboardLayoutMatchesLocale();
@@ skipping 12 matching lines @@
 
   // Verify that the pod shows a list of locales beginning with the recommended
   // ones, followed by others.
   const std::string get_locale_list = base::StringPrintf(
       "var languageSelect = document.getElementById('pod-row')"
       "    .getPodWithUsername_('%s').querySelector('.language-select');"
       "var locales = [];"
       "for (var i = 0; i < languageSelect.length; ++i)"
       "  locales.push(languageSelect.options[i].value);"
       "domAutomationController.send(JSON.stringify(locales));",
-      user_id_1_.c_str());
+      account_id_1_.GetUserEmail().c_str());
   std::string json;
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(contents_,
                                                      get_locale_list,
                                                      &json));
   scoped_ptr<base::Value> value_ptr = base::JSONReader::Read(json);
   const base::ListValue* locales = NULL;
   ASSERT_TRUE(value_ptr);
   ASSERT_TRUE(value_ptr->GetAsList(&locales));
   EXPECT_LT(arraysize(kRecommendedLocales1), locales->GetSize());
 
@@ skipping 10 matching lines @@
   for (size_t i = 0; i < arraysize(kRecommendedLocales1); ++i)
     recommended_locales.insert(kRecommendedLocales1[i]);
   for (size_t i = arraysize(kRecommendedLocales1); i < locales->GetSize();
        ++i) {
     std::string locale;
     EXPECT_TRUE(locales->GetString(i, &locale));
     EXPECT_EQ(recommended_locales.end(), recommended_locales.find(locale));
   }
 
   // Verify that the first recommended locale is selected.
-  const std::string get_selected_locale =
-      base::StringPrintf(
-          "domAutomationController.send(document.getElementById('pod-row')"
-          "    .getPodWithUsername_('%s').querySelector('.language-select')"
-          "        .value);",
-          user_id_1_.c_str());
+  const std::string get_selected_locale = base::StringPrintf(
+      "domAutomationController.send(document.getElementById('pod-row')"
+      "    .getPodWithUsername_('%s').querySelector('.language-select')"
+      "        .value);",
+      account_id_1_.GetUserEmail().c_str());
   std::string selected_locale;
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(contents_,
                                                      get_selected_locale,
                                                      &selected_locale));
   EXPECT_EQ(kRecommendedLocales1[0], selected_locale);
 
   // Change the list of recommended locales.
   SetRecommendedLocales(kRecommendedLocales2, arraysize(kRecommendedLocales2));
 
   // Also change the display name as it is easy to ensure that policy has been
   // updated by waiting for a display name change.
   device_local_account_policy_.payload().mutable_userdisplayname()->set_value(
       kDisplayName2);
   UploadAndInstallDeviceLocalAccountPolicy();
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   DeviceLocalAccountPolicyBroker* broker =
       connector->GetDeviceLocalAccountPolicyService()->GetBrokerForUser(
-          user_id_1_);
+          account_id_1_.GetUserEmail());
   ASSERT_TRUE(broker);
   broker->core()->store()->Load();
-  WaitForDisplayName(user_id_1_, kDisplayName2);
+  WaitForDisplayName(account_id_1_.GetUserEmail(), kDisplayName2);
 
   // Verify that the new list of locales is shown in the UI.
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(contents_,
                                                      get_locale_list,
                                                      &json));
   value_ptr = base::JSONReader::Read(json);
   locales = NULL;
   ASSERT_TRUE(value_ptr);
   ASSERT_TRUE(value_ptr->GetAsList(&locales));
   EXPECT_LT(arraysize(kRecommendedLocales2), locales->GetSize());
@@ skipping 12 matching lines @@
   // Manually select a different locale.
   ASSERT_TRUE(content::ExecuteScript(
       contents_,
       base::StringPrintf(
           "var languageSelect = document.getElementById('pod-row')"
           "    .getPodWithUsername_('%s').querySelector('.language-select');"
           "languageSelect.value = '%s';"
           "var event = document.createEvent('HTMLEvents');"
           "event.initEvent('change', false, true);"
           "languageSelect.dispatchEvent(event);",
-          user_id_1_.c_str(),
-          kPublicSessionLocale)));
+          account_id_1_.GetUserEmail().c_str(), kPublicSessionLocale)));
 
   // Change the list of recommended locales.
   SetRecommendedLocales(kRecommendedLocales2, arraysize(kRecommendedLocales2));
   device_local_account_policy_.payload().mutable_userdisplayname()->set_value(
       kDisplayName1);
   UploadAndInstallDeviceLocalAccountPolicy();
   broker->core()->store()->Load();
-  WaitForDisplayName(user_id_1_, kDisplayName1);
+  WaitForDisplayName(account_id_1_.GetUserEmail(), kDisplayName1);
 
   // Verify that the manually selected locale is still selected.
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(contents_,
                                                      get_selected_locale,
                                                      &selected_locale));
   EXPECT_EQ(kPublicSessionLocale, selected_locale);
 
   // The UI will request an updated list of keyboard layouts at this point. Wait
   // for the constructions of this list to finish.
   WaitForGetKeyboardLayoutsForLocaleToFinish();
 
   // Manually select a different keyboard layout.
   ASSERT_TRUE(content::ExecuteScript(
       contents_,
       base::StringPrintf(
           "document.getElementById('pod-row').getPodWithUsername_('%s')"
           "    .querySelector('.keyboard-select').value = '%s';",
-          user_id_1_.c_str(),
+          account_id_1_.GetUserEmail().c_str(),
           public_session_input_method_id_.c_str())));
 
   // Click on a different pod, causing focus to shift away and the pod to
   // contract.
   ASSERT_TRUE(content::ExecuteScript(
       contents_,
       base::StringPrintf(
           "document.getElementById('pod-row').getPodWithUsername_('%s')"
           "    .click();",
-          user_id_2_.c_str())));
+          account_id_2_.GetUserEmail().c_str())));
 
   // Click on the pod again, causing it to expand again. Verify that the pod has
   // kept all its state (the advanced form is being shown, the manually selected
   // locale and keyboard layout are selected).
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       contents_,
       base::StringPrintf(
           "var pod ="
           "    document.getElementById('pod-row').getPodWithUsername_('%s');"
           "pod.click();"
           "var state = {};"
           "state.advanced = pod.classList.contains('advanced');"
           "state.locale = pod.querySelector('.language-select').value;"
           "state.keyboardLayout = pod.querySelector('.keyboard-select').value;"
           "console.log(JSON.stringify(state));"
           "domAutomationController.send(JSON.stringify(state));",
-          user_id_1_.c_str()),
+          account_id_1_.GetUserEmail().c_str()),
       &json));
   LOG(ERROR) << json;
   value_ptr = base::JSONReader::Read(json);
   const base::DictionaryValue* state = NULL;
   ASSERT_TRUE(value_ptr);
   ASSERT_TRUE(value_ptr->GetAsDictionary(&state));
   bool advanced = false;
   EXPECT_TRUE(state->GetBoolean("advanced", &advanced));
   EXPECT_TRUE(advanced);
   EXPECT_TRUE(state->GetString("locale", &selected_locale));
   EXPECT_EQ(kPublicSessionLocale, selected_locale);
   std::string selected_keyboard_layout;
   EXPECT_TRUE(state->GetString("keyboardLayout", &selected_keyboard_layout));
   EXPECT_EQ(public_session_input_method_id_, selected_keyboard_layout);
 
   // Click the enter button to start the session.
   ASSERT_TRUE(content::ExecuteScript(
       contents_,
       base::StringPrintf(
           "document.getElementById('pod-row').getPodWithUsername_('%s')"
           "    .querySelector('.enter-button').click();",
-          user_id_1_.c_str())));
+          account_id_1_.GetUserEmail().c_str())));
 
   WaitForSessionStart();
 
   // Verify that the locale and keyboard layout have been applied.
   EXPECT_EQ(kPublicSessionLocale, g_browser_process->GetApplicationLocale());
   EXPECT_EQ(l10n_util::GetLanguage(kPublicSessionLocale),
             icu::Locale::getDefault().getLanguage());
   EXPECT_EQ(public_session_input_method_id_,
             chromeos::input_method::InputMethodManager::Get()
                 ->GetActiveIMEState()
@@ skipping 13 matching lines @@
   // Click on the pod to expand it. Verify that the pod expands to its basic
   // form as there is only one recommended locale.
   bool advanced = false;
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       contents_,
       base::StringPrintf(
           "var pod ="
           "    document.getElementById('pod-row').getPodWithUsername_('%s');"
           "pod.click();"
           "domAutomationController.send(pod.classList.contains('advanced'));",
-          user_id_1_.c_str()),
+          account_id_1_.GetUserEmail().c_str()),
       &advanced));
   EXPECT_FALSE(advanced);
   EXPECT_EQ(l10n_util::GetLanguage(initial_locale_),
             icu::Locale::getDefault().getLanguage());
 
   // Click the enter button to start the session.
   ASSERT_TRUE(content::ExecuteScript(
       contents_,
       base::StringPrintf(
           "document.getElementById('pod-row').getPodWithUsername_('%s')"
           "    .querySelector('.enter-button').click();",
-          user_id_1_.c_str())));
+          account_id_1_.GetUserEmail().c_str())));
 
   WaitForSessionStart();
 
   // Verify that since the recommended locale was invalid, the locale has not
   // changed and the first keyboard layout applicable to the locale was chosen.
   EXPECT_EQ(initial_locale_, g_browser_process->GetApplicationLocale());
   EXPECT_EQ(l10n_util::GetLanguage(initial_locale_),
             icu::Locale::getDefault().getLanguage());
   VerifyKeyboardLayoutMatchesLocale();
 }
@@ skipping 72 matching lines @@
   // Select a different locale.
   ASSERT_TRUE(content::ExecuteScript(
       contents_,
       base::StringPrintf(
           "var languageSelect = document.getElementById('pod-row')"
           "    .getPodWithUsername_('%s').querySelector('.language-select');"
           "languageSelect.value = '%s';"
           "var event = document.createEvent('HTMLEvents');"
           "event.initEvent('change', false, true);"
           "languageSelect.dispatchEvent(event);",
-          user_id_1_.c_str(),
-          kPublicSessionLocale)));
+          account_id_1_.GetUserEmail().c_str(), kPublicSessionLocale)));
 
   // The UI will have requested an updated list of keyboard layouts at this
   // point. Wait for the constructions of this list to finish.
   WaitForGetKeyboardLayoutsForLocaleToFinish();
 
   // Set up an observer that will quit the message loop when login has succeeded
   // and the first wizard screen, if any, is being shown.
   base::RunLoop login_wait_run_loop;
   chromeos::MockAuthStatusConsumer login_status_consumer;
   EXPECT_CALL(login_status_consumer, OnAuthSuccess(_)).Times(1).WillOnce(
       InvokeWithoutArgs(&login_wait_run_loop, &base::RunLoop::Quit));
   chromeos::ExistingUserController* controller =
       chromeos::ExistingUserController::current_controller();
   ASSERT_TRUE(controller);
   controller->set_login_status_consumer(&login_status_consumer);
 
   // Manually select a different keyboard layout and click the enter button to
   // start the session.
   ASSERT_TRUE(content::ExecuteScript(
       contents_,
       base::StringPrintf(
           "var pod ="
           "    document.getElementById('pod-row').getPodWithUsername_('%s');"
           "pod.querySelector('.keyboard-select').value = '%s';"
           "pod.querySelector('.enter-button').click();",
-          user_id_1_.c_str(),
+          account_id_1_.GetUserEmail().c_str(),
           public_session_input_method_id_.c_str())));
 
   // Spin the loop until the login observer fires. Then, unregister the
   // observer.
   login_wait_run_loop.Run();
   controller->set_login_status_consumer(NULL);
 
   // Verify that the Terms of Service screen is being shown.
   chromeos::WizardController* wizard_controller =
         chromeos::WizardController::default_controller();
@@ skipping 293 matching lines @@
   ASSERT_TRUE(content::ExecuteScript(contents_,
                                      "$('tos-accept-button').click();"));
 
   WaitForSessionStart();
 }
 
 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance,
                         TermsOfServiceDownloadTest, testing::Bool());
 
 }  // namespace policy