Removing command_execution_timeout_ms in favor of action_max_timeout_ms.

chrome/test/pyautolib/pyautolib.i

Index: chrome/test/pyautolib/pyautolib.i
===================================================================
--- chrome/test/pyautolib/pyautolib.i	(revision 79305)
+++ chrome/test/pyautolib/pyautolib.i	(working copy)
@@ -194,15 +194,6 @@
       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();
@@ -374,6 +365,15 @@
       _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,