Revert of This CL replaces e-mail with AccountId on user selection screen.

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 675 matching lines @@
   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'));",
-            account_id_1_.Serialize().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 121 matching lines @@
 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);",
-      account_id_1_.Serialize().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);",
-      account_id_1_.Serialize().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();",
-          account_id_1_.Serialize().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(
           account_id_1_.GetUserEmail());
@@ skipping 16 matching lines @@
   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);",
-          account_id_1_.Serialize().c_str()),
+          account_id_1_.GetUserEmail().c_str()),
       &expanded));
   EXPECT_TRUE(expanded);
 }
 
 IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, PolicyDownload) {
   UploadDeviceLocalAccountPolicy();
   AddPublicSessionToDevicePolicy(kAccountId1);
 
   WaitForPolicy();
 
@@ skipping 706 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();",
-          account_id_1_.Serialize().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'));",
-          account_id_1_.Serialize().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);",
-          account_id_1_.Serialize().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();",
-          account_id_1_.Serialize().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();",
-          account_id_1_.Serialize().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));",
-      account_id_1_.Serialize().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 14 matching lines @@
     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);",
-      account_id_1_.Serialize().c_str());
+      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
@@ skipping 34 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);",
-          account_id_1_.Serialize().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(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';",
-          account_id_1_.Serialize().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();",
-          account_id_2_.Serialize().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));",
-          account_id_1_.Serialize().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();",
-          account_id_1_.Serialize().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'));",
-          account_id_1_.Serialize().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();",
-          account_id_1_.Serialize().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);",
-          account_id_1_.Serialize().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();",
-          account_id_1_.Serialize().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