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

chrome_frame/external_tab.cc

 // Copyright (c) 2010 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.
 
 #include "chrome_frame/external_tab.h"
 #include "base/singleton.h"
 #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);
 DISABLE_RUNNABLE_METHOD_REFCOUNT(UIDelegate);
 
 namespace {
   Singleton<ChromeProxyFactory> g_proxy_factory;
 
   struct UserDataHolder : public SyncMessageContext {
     explicit UserDataHolder(void* p) : data(p) {}
@@ skipping 243 matching lines @@
                                      const std::string& target) {
   ui_.PostTask(FROM_HERE, NewRunnableMethod(ui_delegate_,
       &UIDelegate::OnMessageFromChromeFrame, message, origin, target));
 }
 
 void ExternalTabProxy::HandleAccelerator(const MSG& accel_message) {
   ui_.PostTask(FROM_HERE, NewRunnableMethod(ui_delegate_,
       &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));
 }
 
 void ExternalTabProxy::TabbedOut(bool reverse) {
   ui_.PostTask(FROM_HERE, NewRunnableMethod(ui_delegate_,
       &UIDelegate::OnTabbedOut, reverse));
 }
 
 void ExternalTabProxy::GoToHistoryOffset(int offset) {
@@ skipping 41 matching lines @@
 }
 
 void ExternalTabProxy::TabClosed() {
   // TODO(stoyan):
 }
 
 void ExternalTabProxy::AttachTab(
     const IPC::AttachExternalTabParams& attach_params) {
   // TODO(stoyan):
 }