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

Unified Diff: chrome/test/chromedriver/chrome_launcher.cc

Issue 2319223002: [chromedriver] Set page load strategy via constructor rather than a setter. (Closed)
Patch Set: Created 4 years, 3 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/test/chromedriver/chrome/stub_chrome.cc ('k') | chrome/test/chromedriver/session_commands.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 3448ba6458ec8eefeb985e6edf38c9482e16beba..d156128032d9324e7ffdc498d39ea6756a477253 100644
--- a/chrome/test/chromedriver/chrome_launcher.cc
+++ b/chrome/test/chromedriver/chrome_launcher.cc
@@ -307,7 +307,8 @@ Status LaunchRemoteChromeSession(
chrome->reset(new ChromeRemoteImpl(std::move(devtools_http_client),
std::move(devtools_websocket_client),
- *devtools_event_listeners));
+ *devtools_event_listeners,
+ capabilities.page_load_strategy));
return Status(kOk);
}
@@ -441,11 +442,17 @@ Status LaunchDesktopChrome(
<< status.message();
}
- std::unique_ptr<ChromeDesktopImpl> chrome_desktop(new ChromeDesktopImpl(
- std::move(devtools_http_client), std::move(devtools_websocket_client),
- *devtools_event_listeners, std::move(port_reservation),
- std::move(process), command, &user_data_dir, &extension_dir,
- capabilities.network_emulation_enabled));
+ std::unique_ptr<ChromeDesktopImpl> chrome_desktop(
+ new ChromeDesktopImpl(std::move(devtools_http_client),
+ std::move(devtools_websocket_client),
+ *devtools_event_listeners,
+ std::move(port_reservation),
+ capabilities.page_load_strategy,
+ std::move(process),
+ command,
+ &user_data_dir,
+ &extension_dir,
+ capabilities.network_emulation_enabled));
for (size_t i = 0; i < extension_bg_pages.size(); ++i) {
VLOG(0) << "Waiting for extension bg page load: " << extension_bg_pages[i];
std::unique_ptr<WebView> web_view;
@@ -520,10 +527,12 @@ Status LaunchAndroidChrome(
<< status.message();
}
- chrome->reset(new ChromeAndroidImpl(
- std::move(devtools_http_client), std::move(devtools_websocket_client),
- *devtools_event_listeners, std::move(port_reservation),
- std::move(device)));
+ chrome->reset(new ChromeAndroidImpl(std::move(devtools_http_client),
+ std::move(devtools_websocket_client),
+ *devtools_event_listeners,
+ std::move(port_reservation),
+ capabilities.page_load_strategy,
+ std::move(device)));
return Status(kOk);
}
« no previous file with comments | « chrome/test/chromedriver/chrome/stub_chrome.cc ('k') | chrome/test/chromedriver/session_commands.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698