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

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

Issue 23542005: [chromedriver] Improve timeout behavior. Prompted by user who executes script on busy page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 7 years, 4 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/session.cc
diff --git a/chrome/test/chromedriver/session.cc b/chrome/test/chromedriver/session.cc
index 5a187297bb384e25860a0bd74a55f7b06c6d7cb3..ec4782233da3f50b24dd0a289412a80be5501c68 100644
--- a/chrome/test/chromedriver/session.cc
+++ b/chrome/test/chromedriver/session.cc
@@ -20,7 +20,8 @@ FrameInfo::FrameInfo(const std::string& parent_frame_id,
frame_id(frame_id),
chromedriver_frame_id(chromedriver_frame_id) {}
-const int Session::kDefaultPageLoadTimeoutMs = 5 * 60 * 1000;
+const base::TimeDelta Session::kDefaultPageLoadTimeout =
+ base::TimeDelta::FromMinutes(5);
Session::Session(const std::string& id)
: id(id),
@@ -28,8 +29,7 @@ Session::Session(const std::string& id)
detach(false),
sticky_modifiers(0),
mouse_position(0, 0),
- page_load_timeout(
- base::TimeDelta::FromMilliseconds(kDefaultPageLoadTimeoutMs)) {}
+ page_load_timeout(kDefaultPageLoadTimeout) {}
Session::Session(const std::string& id, scoped_ptr<Chrome> chrome)
: id(id),
@@ -38,8 +38,7 @@ Session::Session(const std::string& id, scoped_ptr<Chrome> chrome)
chrome(chrome.Pass()),
sticky_modifiers(0),
mouse_position(0, 0),
- page_load_timeout(
- base::TimeDelta::FromMilliseconds(kDefaultPageLoadTimeoutMs)),
+ page_load_timeout(kDefaultPageLoadTimeout),
capabilities(CreateCapabilities()) {}
Session::~Session() {}

Powered by Google App Engine
This is Rietveld 408576698