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

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

Issue 6685099: Removing command_execution_timeout_ms in favor of action_max_timeout_ms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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/test/pyautolib/pyauto.py ('k') | chrome/test/pyautolib/pyautolib.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/pyautolib/pyautolib.h
===================================================================
--- chrome/test/pyautolib/pyautolib.h (revision 80714)
+++ chrome/test/pyautolib/pyautolib.h (working copy)
@@ -168,7 +168,9 @@
// automation proxy additions. Returns response as JSON dict.
// Use -ve window_index for automation calls not targetted at a browser
// window. Example: Login call for chromeos.
- std::string _SendJSONRequest(int window_index, const std::string& request);
+ std::string _SendJSONRequest(int window_index,
+ const std::string& request,
+ int timeout);
// Execute javascript in a given tab, and return the response. This is
// a low-level method intended for use mostly by GetDOMValue(). Note that
@@ -203,8 +205,8 @@
return TestTimeouts::action_max_timeout_ms();
}
- int command_execution_timeout_ms() const {
- return TestTimeouts::command_execution_timeout_ms();
+ int large_test_timeout_ms() const {
+ return TestTimeouts::large_test_timeout_ms();
}
private:
« no previous file with comments | « chrome/test/pyautolib/pyauto.py ('k') | chrome/test/pyautolib/pyautolib.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698