Revert "Refactor automation messages." due to mysterious problems on mac.

chrome_frame/external_tab.cc

Index: chrome_frame/external_tab.cc
diff --git a/chrome_frame/external_tab.cc b/chrome_frame/external_tab.cc
index edc1ad947547a7fd1c66b265a4fdc537bb7c98ae..4bfeff2fd3ecef47757431f35e43f637de298eaf 100644
--- a/chrome_frame/external_tab.cc
+++ b/chrome_frame/external_tab.cc
@@ -7,7 +7,7 @@
 #include "base/tracked.h"
 #include "base/task.h"
 #include "base/waitable_event.h"
-#include "chrome/common/automation_messages.h"
+#include "chrome/test/automation/automation_messages.h"
 #include "chrome_frame/utils.h"
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(ExternalTabProxy);
@@ -271,10 +271,8 @@ void ExternalTabProxy::HandleAccelerator(const MSG& accel_message) {
       &UIDelegate::OnHandleAccelerator, accel_message));
 }
 
-void ExternalTabProxy::HandleContextMenu(
-    HANDLE menu_handle,
-    int align_flags,
-    const IPC::MiniContextMenuParams& params) {
+void ExternalTabProxy::HandleContextMenu(HANDLE menu_handle, int align_flags,
+                                         const IPC::ContextMenuParams& params) {
   ui_.PostTask(FROM_HERE, NewRunnableMethod(ui_delegate_,
       &UIDelegate::OnHandleContextMenu, menu_handle, align_flags, params));
 }