Removing command_execution_timeout_ms in favor of action_max_timeout_ms.

chrome/test/pyautolib/pyautolib.h

 // 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.
 //
 // This file declares the C++ side of PyAuto, the python interface to
 // Chromium automation.  It access Chromium's internals using Automation Proxy.
 
 #ifndef CHROME_TEST_PYAUTOLIB_PYAUTOLIB_H_
 #define CHROME_TEST_PYAUTOLIB_PYAUTOLIB_H_
 #pragma once
@@ skipping 150 matching lines @@
   bool RemoveBookmark(std::wstring& id);
 
   // Get a handle to browser window at the given index, or NULL on failure.
   scoped_refptr<BrowserProxy> GetBrowserWindow(int window_index);
 
   // Meta-methods.  Generic pattern of passing args and response as
   // JSON dict to avoid future use of the SWIG interface and
   // 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
   // any complicated manipulation of the page should be done by something
   // like WebDriver, not PyAuto. Also note that in order for the script to
   // return a value to the calling code, it invoke
   // window.domAutomationController.send(), passing in the intended return
   // value.
   std::wstring ExecuteJavascript(const std::wstring& script,
                                  int window_index = 0,
@@ skipping 14 matching lines @@
   bool SetCookie(const GURL& cookie_url, const std::string& value,
                  int window_index = 0, int tab_index = 0);
   // Gets a cookie value for the given url.
   std::string GetCookie(const GURL& cookie_url, int window_index = 0,
                         int tab_index = 0);
 
   int action_max_timeout_ms() const {
     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:
   // Enables PostTask to main thread.
   // Should be shared across multiple instances of PyUITestBase so that this
   // class is re-entrant and multiple instances can be created.
   // This is necessary since python's unittest module creates instances of
   // TestCase at load time itself.
   static MessageLoop* GetSharedMessageLoop(MessageLoop::Type msg_loop_type);
   static MessageLoop* message_loop_;
 
   // Path to named channel id.
   std::string named_channel_id_;
 };
 
 #endif  // CHROME_TEST_PYAUTOLIB_PYAUTOLIB_H_