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

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, 9 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/pyautolib/pyautolib.cc
===================================================================
--- chrome/test/pyautolib/pyautolib.cc (revision 79305)
+++ chrome/test/pyautolib/pyautolib.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -320,15 +320,22 @@
std::string PyUITestBase::_SendJSONRequest(int window_index,
const std::string& request) {
+ return _SendJSONRequest(window_index, request,
+ TestTimeouts::action_max_timeout_ms());
+}
+
+std::string PyUITestBase::_SendJSONRequest(int window_index,
+ 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, &response, timeout));
} 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, &response, timeout));
}
}
return response;

Powered by Google App Engine
This is Rietveld 408576698