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

chrome_frame/test/automation_client_mock.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_TEST_AUTOMATION_CLIENT_MOCK_H_
 #define CHROME_FRAME_TEST_AUTOMATION_CLIENT_MOCK_H_
 
 #include <windows.h>
 #include <string>
 
 #include "chrome_frame/chrome_frame_automation.h"
@@ skipping 33 matching lines @@
   MOCK_METHOD2(OnDidNavigate, void(int tab_handle,
       const IPC::NavigationInfo& navigation_info));
   MOCK_METHOD3(OnNavigationFailed, void(int tab_handle, int error_code,
       const GURL& gurl));
   MOCK_METHOD2(OnLoad, void(int tab_handle, const GURL& url));
   MOCK_METHOD4(OnMessageFromChromeFrame, void(int tab_handle,
       const std::string& message,
       const std::string& origin,
       const std::string& target));
   MOCK_METHOD4(OnHandleContextMenu, void(int tab_handle, HANDLE menu_handle,
-      int align_flags, const IPC::MiniContextMenuParams& params));
+      int align_flags, const IPC::ContextMenuParams& params));
   MOCK_METHOD3(OnRequestStart, void(int tab_handle, int request_id,
       const IPC::AutomationURLRequest& request));
   MOCK_METHOD3(OnRequestRead, void(int tab_handle, int request_id,
       int bytes_to_read));
   MOCK_METHOD3(OnRequestEnd, void(int tab_handle, int request_id,
       const URLRequestStatus& status));
   MOCK_METHOD3(OnSetCookieAsync, void(int tab_handle, const GURL& url,
       const std::string& cookie));
 
   // Use for sending network responses
@@ skipping 115 matching lines @@
     tracker_.reset(new AutomationHandleTracker());
 
     client_ = new ChromeFrameAutomationClient;
     client_->set_proxy_factory(&factory_);
   }
 };
 
 
 #endif  // CHROME_FRAME_TEST_AUTOMATION_CLIENT_MOCK_H_