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

chrome_frame/chrome_frame_delegate.h

 // 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.
 
 #ifndef CHROME_FRAME_CHROME_FRAME_DELEGATE_H_
 #define CHROME_FRAME_CHROME_FRAME_DELEGATE_H_
 
 #include <atlbase.h>
 #include <atlwin.h>
 #include <queue>
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/lock.h"
-#include "chrome/common/automation_messages.h"
+#include "chrome/test/automation/automation_messages.h"
 #include "ipc/ipc_message.h"
 
 // A common interface supported by all the browser specific ChromeFrame
 // implementations.
 class ChromeFrameDelegate {
  public:
   typedef HWND WindowType;
 
   virtual WindowType GetWindow() const = 0;
   virtual void GetBounds(RECT* bounds) = 0;
@@ skipping 74 matching lines @@
                              const IPC::NavigationInfo& navigation_info) {}
   virtual void OnNavigationFailed(int tab_handle, int error_code,
                                   const GURL& gurl) {}
   virtual void OnLoad(int tab_handle, const GURL& url) {}
   virtual void OnMessageFromChromeFrame(int tab_handle,
                                         const std::string& message,
                                         const std::string& origin,
                                         const std::string& target) {}
   virtual void OnHandleContextMenu(int tab_handle, HANDLE menu_handle,
                                    int align_flags,
-                                   const IPC::MiniContextMenuParams& params) {}
+                                   const IPC::ContextMenuParams& params) {}
   virtual void OnRequestStart(int tab_handle, int request_id,
                               const IPC::AutomationURLRequest& request) {}
   virtual void OnRequestRead(int tab_handle, int request_id,
                              int bytes_to_read) {}
   virtual void OnRequestEnd(int tab_handle, int request_id,
                             const URLRequestStatus& status) {}
   virtual void OnDownloadRequestInHost(int tab_handle, int request_id) {}
   virtual void OnSetCookieAsync(int tab_handle, const GURL& url,
                                 const std::string& cookie) {}
   virtual void OnAttachExternalTab(int tab_handle,
@@ skipping 84 matching lines @@
     }
 
     return false;
   }
 
   Lock lock_;
   std::queue<Task*> pending_tasks_;
 };
 
 #endif  // CHROME_FRAME_CHROME_FRAME_DELEGATE_H_