Removing command_execution_timeout_ms in favor of action_max_timeout_ms.

chrome/test/pyautolib/pyautolib.i

 // Copyright (c) 2010 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.
 //
 // Swig Interface for PyAuto.
 // PyAuto makes the Automation Proxy interface available in Python
 //
 // Running swig as:
 //   swig -python -c++ chrome/test/pyautolib/pyautolib.i
 // would generate pyautolib.py, pyautolib_wrap.cxx
@@ skipping 176 matching lines @@
   virtual void SetUp();
   %feature("docstring",
            "Closes all windows and destroys the browser.") TearDown;
   virtual void TearDown();
 
   %feature("docstring", "Timeout (in milli secs) for an action. "
            "This value is also used as default for the WaitUntil() method.")
       action_max_timeout_ms;
   int action_max_timeout_ms() const;
 
-  %feature("docstring", "Get the timeout (in milli secs) for an automation "
-           "call") command_execution_timeout_ms;
-  int command_execution_timeout_ms() const;
-  %feature("docstring", "Set the timeout (in milli secs) for an automation "
-           "call.  This is an internal method.  Do not use this directly.  "
-           "Use CmdExecutionTimeoutChanger instead")
-      set_command_execution_timeout_ms;
-  void set_command_execution_timeout_ms(int timeout);
-
   %feature("docstring", "Launches the browser and IPC testing server.")
       LaunchBrowserAndServer;
   void LaunchBrowserAndServer();
   %feature("docstring", "Closes the browser and IPC testing server.")
       CloseBrowserAndServer;
   void CloseBrowserAndServer();
 
   %feature("docstring", "Determine if the profile is set to be cleared on "
                         "next startup.") get_clear_profile;
   bool get_clear_profile() const;
@@ skipping 151 matching lines @@
                         "zero-based index.") GetBrowserWindow;
   scoped_refptr<BrowserProxy> GetBrowserWindow(int window_index);
 
   // Meta-method
   %feature("docstring", "Send a sync JSON request to Chrome.  "
                         "Returns a JSON dict as a response.  "
                         "Internal method.")
       _SendJSONRequest;
   std::string _SendJSONRequest(int window_index, const std::string& request);
 
+  // Meta-method
+  %feature("docstring", "Send a sync JSON request to Chrome.  "
+                        "Returns a JSON dict as a response.  "
+                        "Internal method.")
+      _SendJSONRequest;
+  std::string _SendJSONRequest(int window_index,
+                               const std::string& request,
+                               int timeout);
+
   %feature("docstring", "Execute a string of javascript in the specified "
            "(window, tab, frame) and return a string.") ExecuteJavascript;
   std::wstring ExecuteJavascript(const std::wstring& script,
                                  int window_index=0,
                                  int tab_index=0,
                                  const std::wstring& frame_xpath="");
 
   %feature("docstring", "Evaluate a javascript expression in the specified "
            "(window, tab, frame) and return the specified DOM value "
            "as a string. This is a wrapper around "
@@ skipping 34 matching lines @@
   %feature("docstring", "Get FilePath to the document root") document_root;
   const FilePath& document_root() const;
 
   std::string GetScheme() const;
 
   %feature("docstring", "Get URL for a file path") GetURL;
   GURL GetURL(const std::string& path) const;
 };
 }