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

chrome_frame/chrome_active_document.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_ACTIVE_DOCUMENT_H_
 #define CHROME_FRAME_CHROME_ACTIVE_DOCUMENT_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <atlctl.h>
@@ skipping 326 matching lines @@
   // IHTMLPrivateWindow methods
   STDMETHOD(GetAddressBarUrl)(BSTR* url);
 
   // ChromeFrameActivexBase overrides
   HRESULT IOleObject_SetClientSite(IOleClientSite* client_site);
 
   HRESULT ActiveXDocActivate(LONG verb);
 
   // Callbacks from ChromeFramePlugin<T>
   bool PreProcessContextMenu(HMENU menu);
-  bool HandleContextMenuCommand(UINT cmd,
-                                const IPC::MiniContextMenuParams& params);
+  bool HandleContextMenuCommand(UINT cmd, const IPC::ContextMenuParams& params);
 
  // ChromeFramePlugin overrides.
   virtual void OnAutomationServerReady();
 
   // IEnumPrivacyRecords
   STDMETHOD(Reset)();
   STDMETHOD(GetSize)(ULONG* size);
   STDMETHOD(GetPrivacyImpacted)(BOOL* privacy_impacted);
   STDMETHOD(Next)(BSTR* url, BSTR* policy, LONG* reserved, DWORD* flags);
 
@@ skipping 122 matching lines @@
   UrlmonUrlRequestManager::PrivacyInfo::PrivacyRecords::iterator
       next_privacy_record_;
 
   // Dimensions of the window. Used only when opening popups.
   gfx::Rect dimensions_;
  public:
   OLEINPLACEFRAMEINFO frame_info_;
 };
 
 #endif  // CHROME_FRAME_CHROME_ACTIVE_DOCUMENT_H_