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

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: Remove DEPS modifications. Created 4 years, 10 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
Index: chrome/test/chromedriver/alert_commands.cc
diff --git a/chrome/test/chromedriver/alert_commands.cc b/chrome/test/chromedriver/alert_commands.cc
index f75e440a5109d21fa5a27165bce7e6ca1045c221..e953f3c9bceb4f959cd9b91e4c5a1264d9f33dc2 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(
@@ -32,7 +33,7 @@ Status ExecuteAlertCommand(
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;

Powered by Google App Engine
This is Rietveld 408576698