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

chrome/test/automation/automation_messages_internal.h

Index: chrome/test/automation/automation_messages_internal.h
===================================================================
--- chrome/test/automation/automation_messages_internal.h	(revision 25555)
+++ chrome/test/automation/automation_messages_internal.h	(working copy)
@@ -1001,13 +1001,6 @@
   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.
@@ -1073,4 +1066,16 @@
   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)