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

Unified Diff: chrome/test/chromedriver/performance_logger.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
Index: chrome/test/chromedriver/performance_logger.cc
diff --git a/chrome/test/chromedriver/performance_logger.cc b/chrome/test/chromedriver/performance_logger.cc
index 387d32dc786448632922d46d34353afbdf5c68e5..4b264546756044ba1b50bb898ea4271e9b1fc64a 100644
--- a/chrome/test/chromedriver/performance_logger.cc
+++ b/chrome/test/chromedriver/performance_logger.cc
@@ -17,6 +17,7 @@
#include "chrome/test/chromedriver/chrome/devtools_client_impl.h"
#include "chrome/test/chromedriver/chrome/log.h"
#include "chrome/test/chromedriver/chrome/status.h"
+#include "chrome/test/chromedriver/net/timeout.h"
#include "chrome/test/chromedriver/session.h"
namespace {
@@ -268,7 +269,7 @@ Status PerformanceLogger::CollectTraceEvents() {
// Block up to 30 seconds until Tracing.tracingComplete event is received.
status = browser_client_->HandleEventsUntil(
base::Bind(&PerformanceLogger::IsTraceDone, base::Unretained(this)),
- base::TimeDelta::FromSeconds(30));
+ Timeout(base::TimeDelta::FromSeconds(30)));
if (status.IsError())
return status;
« no previous file with comments | « chrome/test/chromedriver/net/timeout_unittest.cc ('k') | chrome/test/chromedriver/performance_logger_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698