| Index: chrome/test/chromedriver/chrome/devtools_http_client.cc
|
| diff --git a/chrome/test/chromedriver/chrome/devtools_http_client.cc b/chrome/test/chromedriver/chrome/devtools_http_client.cc
|
| index 5174512e4980e8ab8c7dbb854fbc36b914593073..34023aeb18344c24b923324196ed3bd30be1e58b 100644
|
| --- a/chrome/test/chromedriver/chrome/devtools_http_client.cc
|
| +++ b/chrome/test/chromedriver/chrome/devtools_http_client.cc
|
| @@ -70,14 +70,16 @@ DevToolsHttpClient::DevToolsHttpClient(
|
| scoped_refptr<URLRequestContextGetter> context_getter,
|
| const SyncWebSocketFactory& socket_factory,
|
| std::unique_ptr<DeviceMetrics> device_metrics,
|
| - std::unique_ptr<std::set<WebViewInfo::Type>> window_types)
|
| + std::unique_ptr<std::set<WebViewInfo::Type>> window_types,
|
| + std::string page_load_strategy)
|
| : context_getter_(context_getter),
|
| socket_factory_(socket_factory),
|
| server_url_("http://" + address.ToString()),
|
| web_socket_url_prefix_(base::StringPrintf("ws://%s/devtools/page/",
|
| address.ToString().c_str())),
|
| device_metrics_(std::move(device_metrics)),
|
| - window_types_(std::move(window_types)) {
|
| + window_types_(std::move(window_types)),
|
| + page_load_strategy_(page_load_strategy) {
|
| window_types_->insert(WebViewInfo::kPage);
|
| window_types_->insert(WebViewInfo::kApp);
|
| }
|
| @@ -203,7 +205,8 @@ Status DevToolsHttpClient::CloseFrontends(const std::string& for_client_id) {
|
| std::unique_ptr<DevToolsClient> client(new DevToolsClientImpl(
|
| socket_factory_, web_socket_url_prefix_ + *it, *it));
|
| std::unique_ptr<WebViewImpl> web_view(
|
| - new WebViewImpl(*it, &browser_info_, std::move(client), NULL));
|
| + new WebViewImpl(*it, &browser_info_, std::move(client), NULL,
|
| + page_load_strategy_));
|
|
|
| status = web_view->ConnectIfNecessary();
|
| // Ignore disconnected error, because the debugger might have closed when
|
|
|