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

chrome_frame/test/automation_client_mock.h

Index: chrome_frame/test/automation_client_mock.h
diff --git a/chrome_frame/test/automation_client_mock.h b/chrome_frame/test/automation_client_mock.h
index 58928b8890d0801244617772fdf356eb761c447f..2ac30e858303d7c9ec6264988f1498f676fbf40d 100644
--- a/chrome_frame/test/automation_client_mock.h
+++ b/chrome_frame/test/automation_client_mock.h
@@ -51,7 +51,7 @@ struct MockCFDelegate : public ChromeFrameDelegateImpl {
       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,