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

chrome_frame/chrome_frame_plugin.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_PLUGIN_H_
 #define CHROME_FRAME_CHROME_FRAME_PLUGIN_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 102 matching lines @@
   }
 
  protected:
   virtual void OnNavigationFailed(int tab_handle, int error_code,
                                   const GURL& gurl) {
     OnLoadFailed(error_code, gurl.spec());
   }
 
   virtual void OnHandleContextMenu(int tab_handle, HANDLE menu_handle,
                                    int align_flags,
-                                   const IPC::MiniContextMenuParams& params) {
+                                   const IPC::ContextMenuParams& params) {
     if (!menu_handle || !automation_client_.get()) {
       NOTREACHED();
       return;
     }
 
     // TrackPopupMenuEx call will fail on IE on Vista running
     // in low integrity mode. We DO seem to be able to enumerate the menu
     // though, so just clone it and show the copy:
     HMENU copy = UtilCloneContextMenu(static_cast<HMENU>(menu_handle));
     if (!copy)
@@ skipping 78 matching lines @@
   bool PreProcessContextMenu(HMENU menu) {
     // Add an "About" item.
     AppendMenu(menu, MF_STRING, IDC_ABOUT_CHROME_FRAME,
                SimpleResourceLoader::Get(IDS_CHROME_FRAME_MENU_ABOUT).c_str());
     return true;
   }
 
   // Return true if menu command is processed, otherwise the command will be
   // passed to Chrome for execution. Override in most-derived class if needed.
   bool HandleContextMenuCommand(UINT cmd,
-                                const IPC::MiniContextMenuParams& params) {
+                                const IPC::ContextMenuParams& params) {
     return false;
   }
 
   // Allow overriding the type of automation client used, for unit tests.
   virtual ChromeFrameAutomationClient* CreateAutomationClient() {
     return new ChromeFrameAutomationClient;
   }
 
   void GiveFocusToChrome(bool restore_focus_to_view) {
     if (IsValid()) {
@@ skipping 38 matching lines @@
 
   // List of functions to enable for automation, or a single entry "*" to
   // enable all functions for automation.  Ignored unless is_privileged_ is
   // true.  Defaults to the empty list, meaning automation will not be
   // turned on.
   std::vector<std::string> functions_enabled_;
 };
 
 #endif  // CHROME_FRAME_CHROME_FRAME_PLUGIN_H_