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

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

Issue 1669453002: [chromedriver] Apply page load timeout to slow cross-process navigations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pure virtual Created 4 years, 8 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/chrome_tests.gypi ('k') | chrome/test/chromedriver/chrome/chrome_desktop_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/chromedriver/alert_commands.cc
diff --git a/chrome/test/chromedriver/alert_commands.cc b/chrome/test/chromedriver/alert_commands.cc
index 6cf5c959f98424572688ee2a668a31f7121b55a0..1846eac15962a3f69712a7a8fdc12a416d3a0f9a 100644
--- a/chrome/test/chromedriver/alert_commands.cc
+++ b/chrome/test/chromedriver/alert_commands.cc
@@ -11,6 +11,7 @@
#include "chrome/test/chromedriver/chrome/javascript_dialog_manager.h"
#include "chrome/test/chromedriver/chrome/status.h"
#include "chrome/test/chromedriver/chrome/web_view.h"
+#include "chrome/test/chromedriver/net/timeout.h"
#include "chrome/test/chromedriver/session.h"
Status ExecuteAlertCommand(const AlertCommand& alert_command,
@@ -31,7 +32,7 @@ Status ExecuteAlertCommand(const AlertCommand& alert_command,
return status;
status = web_view->WaitForPendingNavigations(
- session->GetCurrentFrameId(), session->page_load_timeout, true);
+ session->GetCurrentFrameId(), Timeout(session->page_load_timeout), true);
if (status.IsError() && status.code() != kUnexpectedAlertOpen)
return status;
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/test/chromedriver/chrome/chrome_desktop_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698