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

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

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/pyautolib.h ('k') | chrome/test/pyautolib/pyautolib.i » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/pyautolib/pyautolib.cc
===================================================================
--- chrome/test/pyautolib/pyautolib.cc (revision 80714)
+++ chrome/test/pyautolib/pyautolib.cc (working copy)
@@ -323,16 +323,17 @@
}
std::string PyUITestBase::_SendJSONRequest(int window_index,
- const std::string& request) {
+ const std::string& request,
+ int timeout) {
std::string response;
if (window_index < 0) { // Do not need to target a browser window.
- EXPECT_TRUE(automation()->SendJSONRequest(request, &response));
+ EXPECT_TRUE(automation()->SendJSONRequest(request, timeout, &response));
} else {
scoped_refptr<BrowserProxy> browser_proxy =
automation()->GetBrowserWindow(window_index);
EXPECT_TRUE(browser_proxy.get());
if (browser_proxy.get()) {
- EXPECT_TRUE(browser_proxy->SendJSONRequest(request, &response));
+ EXPECT_TRUE(browser_proxy->SendJSONRequest(request, timeout, &response));
}
}
return response;
« no previous file with comments | « chrome/test/pyautolib/pyautolib.h ('k') | chrome/test/pyautolib/pyautolib.i » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698