chrome/test/chromedriver/chrome_launcher.cc - Issue 2125123002: [chromedriver] Add page loading strategy to capabilities

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/test/chromedriver/chrome_launcher.cc

Issue 2125123002: [chromedriver] Add page loading strategy to capabilities (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clearer naming, checks for valid strategies earlier in parsing Created 4 years, 5 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/test/chromedriver/chrome/web_view_impl.cc ('K') | « chrome/test/chromedriver/chrome/web_view_impl.cc ('k') | chrome/test/chromedriver/client/chromedriver.py » ('j') | chrome/test/chromedriver/test/run_py_tests.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/chromedriver/chrome_launcher.cc

diff --git a/chrome/test/chromedriver/chrome_launcher.cc b/chrome/test/chromedriver/chrome_launcher.cc

index 64780d785c92be3c3c7e4ae72c3f55f3febd9ea4..18ff75cef16a4bdcdf6dabcdf74dd1d306df3c3c 100644

--- a/chrome/test/chromedriver/chrome_launcher.cc

+++ b/chrome/test/chromedriver/chrome_launcher.cc

@@ -197,7 +197,7 @@ Status WaitForDevToolsAndCheckVersion(

std::unique_ptr<DevToolsHttpClient> client(new DevToolsHttpClient(

address, context_getter, socket_factory, std::move(device_metrics),

- std::move(window_types)));

+ std::move(window_types), capabilities->page_load_strategy));

base::TimeTicks deadline =

base::TimeTicks::Now() + base::TimeDelta::FromSeconds(60);

Status status = client->Init(deadline - base::TimeTicks::Now());

@@ -273,7 +273,7 @@ Status LaunchRemoteChromeSession(

std::unique_ptr<DevToolsHttpClient> devtools_http_client;

status = WaitForDevToolsAndCheckVersion(

capabilities.debugger_address, context_getter, socket_factory,

- NULL, &devtools_http_client);

+ &capabilities, &devtools_http_client);

if (status.IsError()) {

return Status(kUnknownError, "cannot connect to chrome at " +

capabilities.debugger_address.ToString(),