chrome/browser/chromeos/policy/device_local_account_browsertest.cc - Issue 653123002: Revert of ChromeOS NetworkScreenHandler should not call CheckAndResolveLocale on UI thread. (patchs…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 653123002: Revert of ChromeOS NetworkScreenHandler should not call CheckAndResolveLocale on UI thread. (patchs… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 months 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/wizard_controller_browsertest.cc ('k') | chrome/browser/resources/chromeos/login/oobe_screen_terms_of_service.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 c1db9b53554dfb557680e3771023b1c3f5acba5b..55fe1f8d10470cd09867b0bf80a882b3c3369e35 100644

--- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc

+++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc

@@ -1923,25 +1923,6 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, TermsOfServiceWithLocaleSwitch) {

->GetCurrentInputMethod()

.id());

- // Wait for 'tos-accept-button' to become enabled.

- done = false;

- ASSERT_TRUE(content::ExecuteScriptAndExtractBool(

- contents_,

- "var screenElement = document.getElementById('tos-accept-button');"

- "function SendReplyIfAcceptEnabled() {"

- " if ($('tos-accept-button').disabled)"

- " return false;"

- " domAutomationController.send(true);"

- " observer.disconnect();"

- " return true;"

- "}"

- "var observer = new MutationObserver(SendReplyIfAcceptEnabled);"

- "if (!SendReplyIfAcceptEnabled()) {"

- " var options = { attributes: true };"

- " observer.observe(screenElement, options);"

- "}",

- &done));

// Click the accept button.

ASSERT_TRUE(content::ExecuteScript(contents_,

"$('tos-accept-button').click();"));