chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc - Issue 981243003: Make commands consistent across security interstitials

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/ssl/captive_portal_blocking_page_browsertest.cc

Issue 981243003: Make commands consistent across security interstitials (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Tests Created 5 years, 9 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

« chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc ('K') | « chrome/browser/ssl/captive_portal_blocking_page.cc ('k') | chrome/browser/ssl/ssl_blocking_page.h » ('j') | chrome/browser/ssl/ssl_blocking_page.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc

diff --git a/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc b/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc

index 2e6b6cd82e949585d36170ae0fcee2f9ebdc1322..ec7402c4aab6ec90f242dfee36ab86105715f7cd 100644

--- a/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc

+++ b/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc

@@ -39,12 +39,12 @@ bool IsInterstitialDisplayingText(content::InterstitialPage* interstitial,

DCHECK(text.find("\'") == std::string::npos);

std::string command = base::StringPrintf(

"var hasText = document.body.textContent.indexOf('%s') >= 0;"

- "window.domAutomationController.send(hasText);",

+ "window.domAutomationController.send(hasText ? 1 : 0);",

text.c_str());

- bool result = false;

- EXPECT_TRUE(content::ExecuteScriptAndExtractBool(

+ int result = 0;

+ EXPECT_TRUE(content::ExecuteScriptAndExtractInt(

interstitial->GetMainFrame(), command, &result));

- return result;

+ return result == 1;

}

enum ExpectWiFi {