First pass at refactoring pyautolib in preparation for removing proxy dependencies.

chrome/common/automation_messages_internal.h

 // Copyright (c) 2012 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.
 
 // Defines the IPC messages used by the automation interface.
 
 // NOTE: All IPC messages have either a routing_id of 0 (for asynchronous
 //       messages), or one that's been assigned by the proxy (for calls
 //       which expect a response).  The routing_id shouldn't be used for
 //       any other purpose in these message types.
@@ skipping 838 matching lines @@
 
 // This message informs the browser process to remove the history entries
 // for the specified types across all time ranges. See
 // browsing_data_remover.h for a list of REMOVE_* types supported in the
 // remove_mask parameter.
 IPC_MESSAGE_CONTROL1(AutomationMsg_RemoveBrowsingData,
                      int)
 
 // Generic pyauto pattern to help avoid future addition of
 // automation messages.
-IPC_SYNC_MESSAGE_CONTROL2_2(AutomationMsg_SendJSONRequest,
+IPC_SYNC_MESSAGE_CONTROL2_2(AutomationMsg_SendJSONRequestWithBrowserHandle,
                             int /* browser_handle */,
                             std::string /* JSON request */,
                             std::string /* JSON response */,
                             bool /* success */)
 
 // Resets to the default theme.
 IPC_SYNC_MESSAGE_CONTROL0_0(AutomationMsg_ResetToDefaultTheme)
 
 // This message requests the external tab identified by the tab handle
 // passed in be closed.
@@ skipping 73 matching lines @@
 // code can be removed if that limitation is fixed.
 IPC_SYNC_MESSAGE_CONTROL0_2(AutomationMsg_GetTracingOutput,
                             std::string /* trace_chunk */,
                             bool /* success */)
 
 // Used on Mac OS X to read the number of active Mach ports used in the browser
 // process.
 IPC_SYNC_MESSAGE_CONTROL0_1(AutomationMsg_GetMachPortCount,
                             int /* number of Mach ports */)
 
+// Generic pyauto pattern to help avoid future addition of
+// automation messages.
+IPC_SYNC_MESSAGE_CONTROL2_2(AutomationMsg_SendJSONRequest,
+                            int /* window_index */,
+                            std::string /* JSON request */,
+                            std::string /* JSON response */,
+                            bool /* success */)
+
 // Browser -> renderer messages.
 
 // Requests a snapshot.
 IPC_MESSAGE_ROUTED0(AutomationMsg_SnapshotEntirePage)
 
 #if !defined(NO_TCMALLOC) && (defined(OS_LINUX) || defined(OS_CHROMEOS))
 // Requests to dump a heap profile.
 IPC_MESSAGE_ROUTED1(AutomationMsg_HeapProfilerDump,
                     std::string /* reason */)
 #endif  // !defined(NO_TCMALLOC) && (defined(OS_LINUX) || defined(OS_CHROMEOS))
@@ skipping 30 matching lines @@
 
 // Sent when the automation mouse event has been processed.
 IPC_MESSAGE_ROUTED2(AutomationMsg_ProcessMouseEventACK,
                     bool /* success */,
                     std::string /* error message */)
 
 // YOUR NEW MESSAGE MIGHT NOT BELONG HERE.
 // This is the section for renderer -> browser automation messages. If it is
 // an automation <-> browser message, put it above this section. The "no line
 // number change" applies only to the automation <-> browser messages.