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; |