| 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 b1bcf15ccc49973813cb23ee073bc9359f1beda8..e15614ed179ec09312a0ab5012a793567cd764c4 100644
|
| --- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
|
| +++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
|
| @@ -686,7 +686,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
|
| contents_,
|
| base::StringPrintf(
|
| "var pod ="
|
| - " document.getElementById('pod-row').getPodWithUsername_('%s');"
|
| + " document.getElementById('pod-row').getPodWithUsername('%s');"
|
| "pod.click();"
|
| "domAutomationController.send(pod.classList.contains('advanced'));",
|
| account_id_1_.Serialize().c_str()),
|
| @@ -903,7 +903,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_DisplayName) {
|
| // 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);",
|
| + " .getPodWithUsername('%s').nameElement.textContent);",
|
| account_id_1_.Serialize().c_str());
|
| std::string display_name;
|
| ASSERT_TRUE(content::ExecuteScriptAndExtractString(
|
| @@ -913,7 +913,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_DisplayName) {
|
| 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')"
|
| + " .getPodWithUsername('%s').querySelector('.expanded-pane-name')"
|
| " .textContent);",
|
| account_id_1_.Serialize().c_str());
|
| display_name.clear();
|
| @@ -927,7 +927,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_DisplayName) {
|
| ASSERT_TRUE(content::ExecuteScript(
|
| contents_,
|
| base::StringPrintf(
|
| - "document.getElementById('pod-row').getPodWithUsername_('%s')"
|
| + "document.getElementById('pod-row').getPodWithUsername('%s')"
|
| " .click();",
|
| account_id_1_.Serialize().c_str())));
|
|
|
| @@ -965,7 +965,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_DisplayName) {
|
| contents_,
|
| base::StringPrintf(
|
| "domAutomationController.send(document.getElementById('pod-row')"
|
| - " .getPodWithUsername_('%s').expanded);",
|
| + " .getPodWithUsername('%s').expanded);",
|
| account_id_1_.Serialize().c_str()),
|
| &expanded));
|
| EXPECT_TRUE(expanded);
|
| @@ -1683,7 +1683,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, NoRecommendedLocaleNoSwitch) {
|
| ASSERT_TRUE(content::ExecuteScript(
|
| contents_,
|
| base::StringPrintf(
|
| - "document.getElementById('pod-row').getPodWithUsername_('%s')"
|
| + "document.getElementById('pod-row').getPodWithUsername('%s')"
|
| " .querySelector('.enter-button').click();",
|
| account_id_1_.Serialize().c_str())));
|
|
|
| @@ -1711,7 +1711,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, NoRecommendedLocaleSwitch) {
|
| contents_,
|
| base::StringPrintf(
|
| "var pod ="
|
| - " document.getElementById('pod-row').getPodWithUsername_('%s');"
|
| + " document.getElementById('pod-row').getPodWithUsername('%s');"
|
| "pod.querySelector('.language-and-input').click();"
|
| "domAutomationController.send(pod.classList.contains('advanced'));",
|
| account_id_1_.Serialize().c_str()),
|
| @@ -1723,7 +1723,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, NoRecommendedLocaleSwitch) {
|
| contents_,
|
| base::StringPrintf(
|
| "var languageSelect = document.getElementById('pod-row')"
|
| - " .getPodWithUsername_('%s').querySelector('.language-select');"
|
| + " .getPodWithUsername('%s').querySelector('.language-select');"
|
| "languageSelect.value = '%s';"
|
| "var event = document.createEvent('HTMLEvents');"
|
| "event.initEvent('change', false, true);"
|
| @@ -1740,7 +1740,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, NoRecommendedLocaleSwitch) {
|
| contents_,
|
| base::StringPrintf(
|
| "var pod ="
|
| - " document.getElementById('pod-row').getPodWithUsername_('%s');"
|
| + " document.getElementById('pod-row').getPodWithUsername('%s');"
|
| "pod.querySelector('.keyboard-select').value = '%s';"
|
| "pod.querySelector('.enter-button').click();",
|
| account_id_1_.Serialize().c_str(),
|
| @@ -1774,7 +1774,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, OneRecommendedLocale) {
|
| ASSERT_TRUE(content::ExecuteScript(
|
| contents_,
|
| base::StringPrintf(
|
| - "document.getElementById('pod-row').getPodWithUsername_('%s')"
|
| + "document.getElementById('pod-row').getPodWithUsername('%s')"
|
| " .querySelector('.enter-button').click();",
|
| account_id_1_.Serialize().c_str())));
|
|
|
| @@ -1804,7 +1804,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
|
| // ones, followed by others.
|
| const std::string get_locale_list = base::StringPrintf(
|
| "var languageSelect = document.getElementById('pod-row')"
|
| - " .getPodWithUsername_('%s').querySelector('.language-select');"
|
| + " .getPodWithUsername('%s').querySelector('.language-select');"
|
| "var locales = [];"
|
| "for (var i = 0; i < languageSelect.length; ++i)"
|
| " locales.push(languageSelect.options[i].value);"
|
| @@ -1842,7 +1842,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
|
| // 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')"
|
| + " .getPodWithUsername('%s').querySelector('.language-select')"
|
| " .value);",
|
| account_id_1_.Serialize().c_str());
|
| std::string selected_locale;
|
| @@ -1894,7 +1894,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
|
| contents_,
|
| base::StringPrintf(
|
| "var languageSelect = document.getElementById('pod-row')"
|
| - " .getPodWithUsername_('%s').querySelector('.language-select');"
|
| + " .getPodWithUsername('%s').querySelector('.language-select');"
|
| "languageSelect.value = '%s';"
|
| "var event = document.createEvent('HTMLEvents');"
|
| "event.initEvent('change', false, true);"
|
| @@ -1923,7 +1923,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
|
| ASSERT_TRUE(content::ExecuteScript(
|
| contents_,
|
| base::StringPrintf(
|
| - "document.getElementById('pod-row').getPodWithUsername_('%s')"
|
| + "document.getElementById('pod-row').getPodWithUsername('%s')"
|
| " .querySelector('.keyboard-select').value = '%s';",
|
| account_id_1_.Serialize().c_str(),
|
| public_session_input_method_id_.c_str())));
|
| @@ -1933,7 +1933,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
|
| ASSERT_TRUE(content::ExecuteScript(
|
| contents_,
|
| base::StringPrintf(
|
| - "document.getElementById('pod-row').getPodWithUsername_('%s')"
|
| + "document.getElementById('pod-row').getPodWithUsername('%s')"
|
| " .click();",
|
| account_id_2_.Serialize().c_str())));
|
|
|
| @@ -1944,7 +1944,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
|
| contents_,
|
| base::StringPrintf(
|
| "var pod ="
|
| - " document.getElementById('pod-row').getPodWithUsername_('%s');"
|
| + " document.getElementById('pod-row').getPodWithUsername('%s');"
|
| "pod.click();"
|
| "var state = {};"
|
| "state.advanced = pod.classList.contains('advanced');"
|
| @@ -1972,7 +1972,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MultipleRecommendedLocales) {
|
| ASSERT_TRUE(content::ExecuteScript(
|
| contents_,
|
| base::StringPrintf(
|
| - "document.getElementById('pod-row').getPodWithUsername_('%s')"
|
| + "document.getElementById('pod-row').getPodWithUsername('%s')"
|
| " .querySelector('.enter-button').click();",
|
| account_id_1_.Serialize().c_str())));
|
|
|
| @@ -2005,7 +2005,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, InvalidRecommendedLocale) {
|
| contents_,
|
| base::StringPrintf(
|
| "var pod ="
|
| - " document.getElementById('pod-row').getPodWithUsername_('%s');"
|
| + " document.getElementById('pod-row').getPodWithUsername('%s');"
|
| "pod.click();"
|
| "domAutomationController.send(pod.classList.contains('advanced'));",
|
| account_id_1_.Serialize().c_str()),
|
| @@ -2018,7 +2018,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, InvalidRecommendedLocale) {
|
| ASSERT_TRUE(content::ExecuteScript(
|
| contents_,
|
| base::StringPrintf(
|
| - "document.getElementById('pod-row').getPodWithUsername_('%s')"
|
| + "document.getElementById('pod-row').getPodWithUsername('%s')"
|
| " .querySelector('.enter-button').click();",
|
| account_id_1_.Serialize().c_str())));
|
|
|
| @@ -2108,7 +2108,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, TermsOfServiceWithLocaleSwitch) {
|
| contents_,
|
| base::StringPrintf(
|
| "var languageSelect = document.getElementById('pod-row')"
|
| - " .getPodWithUsername_('%s').querySelector('.language-select');"
|
| + " .getPodWithUsername('%s').querySelector('.language-select');"
|
| "languageSelect.value = '%s';"
|
| "var event = document.createEvent('HTMLEvents');"
|
| "event.initEvent('change', false, true);"
|
| @@ -2136,7 +2136,7 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, TermsOfServiceWithLocaleSwitch) {
|
| contents_,
|
| base::StringPrintf(
|
| "var pod ="
|
| - " document.getElementById('pod-row').getPodWithUsername_('%s');"
|
| + " document.getElementById('pod-row').getPodWithUsername('%s');"
|
| "pod.querySelector('.keyboard-select').value = '%s';"
|
| "pod.querySelector('.enter-button').click();",
|
| account_id_1_.Serialize().c_str(),
|
|
|