Chrome side of the fix for http://b/issue?id=1694574, which is a bug caused w...

chrome/test/automation/automation_messages_internal.h

 // Copyright (c) 2006-2008 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.
 
 // This header is meant to be included in multiple passes, hence no traditional
 // header guard.
 // See ipc_message_macros.h for explanation of the macros and passes.
 
@@ skipping 983 matching lines @@
                       int /* tab handle */)
 
   IPC_MESSAGE_ROUTED1(AutomationMsg_StopAsync,
                       int /* tab handle */)
 
   // Returns the number of times a filter was used to service an URL request.
   // See AutomationMsg_SetFilteredInet.
   IPC_SYNC_MESSAGE_ROUTED0_1(AutomationMsg_GetFilteredInetHitCount,
                              int /* hit_count */)
 
-  IPC_MESSAGE_ROUTED5(AutomationMsg_AttachExternalTab,
-                      int /* tab_handle */,
-                      int /* existing_tab_handle */,
-                      gfx::NativeWindow  /* Tab container window */,
-                      gfx::NativeWindow  /* Tab window */,
-                      int /* disposition */)
-
 #if defined(OS_LINUX) || defined(OS_MACOSX)
   // See previous definition of this message for explanation of why it is
   // defined twice.
   IPC_MESSAGE_ROUTED3(AutomationMsg_WindowClick, int, gfx::Point, int)
 #endif
 
   // This message notifies the AutomationProvider to navigate to a specified
   // url in the tab with given handle. The first parameter is the handle to
   // the tab resource. The second parameter is the target url.  The third
   // parameter is the number of navigations that are required for a successful
@@ skipping 45 matching lines @@
   // values.
   IPC_SYNC_MESSAGE_ROUTED2_1(
       AutomationMsg_GoForwardBlockUntilNavigationsComplete, int, int,
       AutomationMsg_NavigationResponseValues)
 
   // This message is used by automaton clients to upload histogram data to the
   // browser process.
   IPC_MESSAGE_ROUTED1(AutomationMsg_RecordHistograms,
                       std::vector<std::string> /* histogram_list */)
 
+  IPC_MESSAGE_ROUTED3(AutomationMsg_AttachExternalTab,
+                      int /* tab_handle */,
+                      intptr_t /* cookie */,
+                      int /* disposition */)
+
+  // Sent when the automation client connects to an existing tab.
+  IPC_SYNC_MESSAGE_ROUTED1_3(AutomationMsg_ConnectExternalTab,
+                             intptr_t /* cookie */,
+                             gfx::NativeWindow  /* Tab container window */,
+                             gfx::NativeWindow  /* Tab window */,
+                             int  /* Handle to the new tab */)
+
 IPC_END_MESSAGES(Automation)