Removing command_execution_timeout_ms in favor of action_max_timeout_ms.

chrome/test/pyautolib/pyautolib.cc

-// 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.
 
 #include "base/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/test/automation/extension_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/pyautolib/pyautolib.h"
@@ skipping 301 matching lines @@
 
   return browser_proxy->RemoveBookmark(StringToId(id));
 }
 
 scoped_refptr<BrowserProxy> PyUITestBase::GetBrowserWindow(int window_index) {
   return automation()->GetBrowserWindow(window_index);
 }
 
 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;
 }
 
 std::wstring PyUITestBase::ExecuteJavascript(const std::wstring& script,
                                              int window_index,
                                              int tab_index,
                                              const std::wstring& frame_xpath) {
   scoped_refptr<BrowserProxy> browser_proxy =
@@ skipping 50 matching lines @@
   // TODO(phadjan.jr): figure out a way to unambiguously report error.
   if (!browser_proxy.get())
     return cookie_val;
   scoped_refptr<TabProxy> tab_proxy = browser_proxy->GetTab(tab_index);
   EXPECT_TRUE(tab_proxy.get());
   if (!tab_proxy.get())
     return cookie_val;
   EXPECT_TRUE(tab_proxy->GetCookies(cookie_url, &cookie_val));
   return cookie_val;
 }