Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1204)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/policy/device_local_account_browsertest.cc

Issue 1440583002: This CL replaces e-mail with AccountId on user selection screen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed tests. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc ('k') | chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc » ('j') | chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/policy/device_local_account_browsertest.cc
diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
index f7f4019c27ed75f3215cf4ef700a07c8959a003b..ac48a49c37c4adebb251dacb775c97895088012f 100644
--- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
@@ -693,7 +693,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
" document.getElementById('pod-row').getPodWithUsername_('%s');"
"pod.click();"
"domAutomationController.send(pod.classList.contains('advanced'));",
- account_id_1_.GetUserEmail().c_str()),
+ account_id_1_.Serialize().c_str()),
&advanced));
// Verify that the pod expanded to its basic/advanced form, as expected.
EXPECT_EQ(expect_advanced, advanced);
@@ -835,7 +835,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_DisplayName) {
const std::string get_compact_pod_display_name = base::StringPrintf(
"domAutomationController.send(document.getElementById('pod-row')"
" .getPodWithUsername_('%s').nameElement.textContent);",
- account_id_1_.GetUserEmail().c_str());
+ account_id_1_.Serialize().c_str());
std::string display_name;
ASSERT_TRUE(content::ExecuteScriptAndExtractString(
contents_,
@@ -846,7 +846,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_DisplayName) {
"domAutomationController.send(document.getElementById('pod-row')"
" .getPodWithUsername_('%s').querySelector('.expanded-pane-name')"
" .textContent);",
- account_id_1_.GetUserEmail().c_str());
+ account_id_1_.Serialize().c_str());
display_name.clear();
ASSERT_TRUE(content::ExecuteScriptAndExtractString(
contents_,
@@ -860,7 +860,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_DisplayName) {
base::StringPrintf(
"document.getElementById('pod-row').getPodWithUsername_('%s')"
" .click();",
- account_id_1_.GetUserEmail().c_str())));
+ account_id_1_.Serialize().c_str())));
// Change the display name.
device_local_account_policy_.payload().mutable_userdisplayname()->set_value(
@@ -897,7 +897,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_DisplayName) {
base::StringPrintf(
"domAutomationController.send(document.getElementById('pod-row')"
" .getPodWithUsername_('%s').expanded);",
- account_id_1_.GetUserEmail().c_str()),
+ account_id_1_.Serialize().c_str()),
&expanded));
EXPECT_TRUE(expanded);
}
@@ -1624,7 +1624,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, NoRecommendedLocaleNoSwitch) {
base::StringPrintf(
"document.getElementById('pod-row').getPodWithUsername_('%s')"
" .querySelector('.enter-button').click();",
- account_id_1_.GetUserEmail().c_str())));
+ account_id_1_.Serialize().c_str())));
WaitForSessionStart();
@@ -1653,7 +1653,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, NoRecommendedLocaleSwitch) {
" document.getElementById('pod-row').getPodWithUsername_('%s');"
"pod.querySelector('.language-and-input').click();"
"domAutomationController.send(pod.classList.contains('advanced'));",
- account_id_1_.GetUserEmail().c_str()),
+ account_id_1_.Serialize().c_str()),
&advanced));
EXPECT_FALSE(advanced);
@@ -1667,7 +1667,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, NoRecommendedLocaleSwitch) {
"var event = document.createEvent('HTMLEvents');"
"event.initEvent('change', false, true);"
"languageSelect.dispatchEvent(event);",
- account_id_1_.GetUserEmail().c_str(), kPublicSessionLocale)));
+ account_id_1_.Serialize().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.
@@ -1682,7 +1682,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, NoRecommendedLocaleSwitch) {
" document.getElementById('pod-row').getPodWithUsername_('%s');"
"pod.querySelector('.keyboard-select').value = '%s';"
"pod.querySelector('.enter-button').click();",
- account_id_1_.GetUserEmail().c_str(),
+ account_id_1_.Serialize().c_str(),
public_session_input_method_id_.c_str())));
WaitForSessionStart();
@@ -1715,7 +1715,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, OneRecommendedLocale) {
base::StringPrintf(
"document.getElementById('pod-row').getPodWithUsername_('%s')"
" .querySelector('.enter-button').click();",
- account_id_1_.GetUserEmail().c_str())));
+ account_id_1_.Serialize().c_str())));
WaitForSessionStart();
@@ -1748,7 +1748,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
"for (var i = 0; i < languageSelect.length; ++i)"
" locales.push(languageSelect.options[i].value);"
"domAutomationController.send(JSON.stringify(locales));",
- account_id_1_.GetUserEmail().c_str());
+ account_id_1_.Serialize().c_str());
std::string json;
ASSERT_TRUE(content::ExecuteScriptAndExtractString(contents_,
get_locale_list,
@@ -1783,7 +1783,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
"domAutomationController.send(document.getElementById('pod-row')"
" .getPodWithUsername_('%s').querySelector('.language-select')"
" .value);",
- account_id_1_.GetUserEmail().c_str());
+ account_id_1_.Serialize().c_str());
std::string selected_locale;
ASSERT_TRUE(content::ExecuteScriptAndExtractString(contents_,
get_selected_locale,
@@ -1838,7 +1838,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
"var event = document.createEvent('HTMLEvents');"
"event.initEvent('change', false, true);"
"languageSelect.dispatchEvent(event);",
- account_id_1_.GetUserEmail().c_str(), kPublicSessionLocale)));
+ account_id_1_.Serialize().c_str(), kPublicSessionLocale)));
// Change the list of recommended locales.
SetRecommendedLocales(kRecommendedLocales2, arraysize(kRecommendedLocales2));
@@ -1864,7 +1864,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
base::StringPrintf(
"document.getElementById('pod-row').getPodWithUsername_('%s')"
" .querySelector('.keyboard-select').value = '%s';",
- account_id_1_.GetUserEmail().c_str(),
+ account_id_1_.Serialize().c_str(),
public_session_input_method_id_.c_str())));
// Click on a different pod, causing focus to shift away and the pod to
@@ -1874,7 +1874,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
base::StringPrintf(
"document.getElementById('pod-row').getPodWithUsername_('%s')"
" .click();",
- account_id_2_.GetUserEmail().c_str())));
+ account_id_2_.Serialize().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
@@ -1891,7 +1891,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
"state.keyboardLayout = pod.querySelector('.keyboard-select').value;"
"console.log(JSON.stringify(state));"
"domAutomationController.send(JSON.stringify(state));",
- account_id_1_.GetUserEmail().c_str()),
+ account_id_1_.Serialize().c_str()),
&json));
LOG(ERROR) << json;
value_ptr = base::JSONReader::Read(json);
@@ -1913,7 +1913,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
base::StringPrintf(
"document.getElementById('pod-row').getPodWithUsername_('%s')"
" .querySelector('.enter-button').click();",
- account_id_1_.GetUserEmail().c_str())));
+ account_id_1_.Serialize().c_str())));
WaitForSessionStart();
@@ -1947,7 +1947,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, InvalidRecommendedLocale) {
" document.getElementById('pod-row').getPodWithUsername_('%s');"
"pod.click();"
"domAutomationController.send(pod.classList.contains('advanced'));",
- account_id_1_.GetUserEmail().c_str()),
+ account_id_1_.Serialize().c_str()),
&advanced));
EXPECT_FALSE(advanced);
EXPECT_EQ(l10n_util::GetLanguage(initial_locale_),
@@ -1959,7 +1959,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, InvalidRecommendedLocale) {
base::StringPrintf(
"document.getElementById('pod-row').getPodWithUsername_('%s')"
" .querySelector('.enter-button').click();",
- account_id_1_.GetUserEmail().c_str())));
+ account_id_1_.Serialize().c_str())));
WaitForSessionStart();
@@ -2052,7 +2052,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, TermsOfServiceWithLocaleSwitch) {
"var event = document.createEvent('HTMLEvents');"
"event.initEvent('change', false, true);"
"languageSelect.dispatchEvent(event);",
- account_id_1_.GetUserEmail().c_str(), kPublicSessionLocale)));
+ account_id_1_.Serialize().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.
@@ -2078,7 +2078,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, TermsOfServiceWithLocaleSwitch) {
" document.getElementById('pod-row').getPodWithUsername_('%s');"
"pod.querySelector('.keyboard-select').value = '%s';"
"pod.querySelector('.enter-button').click();",
- account_id_1_.GetUserEmail().c_str(),
+ account_id_1_.Serialize().c_str(),
public_session_input_method_id_.c_str())));
// Spin the loop until the login observer fires. Then, unregister the
« no previous file with comments | « chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc ('k') | chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc » ('j') | chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698