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

Unified Diff: chrome/test/pyautolib/pyautolib.h

Issue 10787010: Switch to TimeDelta interfaces in chrome automation test infrastructure. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase onto master. Created 8 years, 5 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/test/ppapi/ppapi_test.cc ('k') | chrome/test/reliability/automated_ui_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/pyautolib/pyautolib.h
diff --git a/chrome/test/pyautolib/pyautolib.h b/chrome/test/pyautolib/pyautolib.h
index 3de0596b0f57e35d75b8d11f5068a1e3fcae91f8..4ac05719746ae01b04251570596f1c0d8c77e357 100644
--- a/chrome/test/pyautolib/pyautolib.h
+++ b/chrome/test/pyautolib/pyautolib.h
@@ -167,12 +167,20 @@ class PyUITestBase : public UITestBase {
std::string GetCookie(const GURL& cookie_url, int window_index = 0,
int tab_index = 0);
+ base::TimeDelta action_max_timeout() const {
+ return TestTimeouts::action_max_timeout();
+ }
+
int action_max_timeout_ms() const {
- return TestTimeouts::action_max_timeout_ms();
+ return action_max_timeout().InMilliseconds();
+ }
+
+ base::TimeDelta large_test_timeout() const {
+ return TestTimeouts::large_test_timeout();
}
int large_test_timeout_ms() const {
- return TestTimeouts::large_test_timeout_ms();
+ return large_test_timeout().InMilliseconds();
}
protected:
« no previous file with comments | « chrome/test/ppapi/ppapi_test.cc ('k') | chrome/test/reliability/automated_ui_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698