Refactor automation messages.

chrome_frame/cfproxy_test.cc

 // 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.
 
 #include <string>
 #include "base/file_path.h"
 #include "base/waitable_event.h"
+#include "chrome/common/automation_messages.h"
 #include "chrome_frame/cfproxy_private.h"
-#include "chrome/test/automation/automation_messages.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gmock_mutant.h"
 
 using testing::_;
 using testing::DoAll;
 using testing::NotNull;
 using testing::Return;
 using testing::StrictMock;
 using testing::InvokeWithoutArgs;
@@ skipping 46 matching lines @@
   //
   MOCK_METHOD3(OpenURL, void(const GURL& url_to_open, const GURL& referrer,
       int open_disposition));
   MOCK_METHOD1(GoToHistoryOffset, void(int offset));
   MOCK_METHOD3(MessageToHost, void(const std::string& message,
       const std::string& origin, const std::string& target));
 
   // Misc. UI.
   MOCK_METHOD1(HandleAccelerator, void(const MSG& accel_message));
   MOCK_METHOD3(HandleContextMenu, void(HANDLE menu_handle, int align_flags,
-      const IPC::ContextMenuParams& params));
+      const IPC::MiniContextMenuParams& params));
   MOCK_METHOD1(TabbedOut, void(bool reverse));
 
   //
   MOCK_METHOD0(TabClosed, void());
   MOCK_METHOD1(AttachTab,
       void(const IPC::AttachExternalTabParams& attach_params));
 };
 
 struct MockSender : public IPC::Message::Sender {
   MOCK_METHOD1(Send, bool(IPC::Message* m));
@@ skipping 378 matching lines @@
 
   // Tuple4<int, string, string, string>
   std::string msg("Load oranges barrels");
   std::string origin("Brothers Karamazov");
   std::string target("Alexander Ivanovich");
   AutomationMsg_ForwardMessageToExternalHost m9(0, 1, msg, origin, target);
   EXPECT_CALL(delegate, MessageToHost(msg, origin, target));
   EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m9));
 
   // Tuple4<int, HANDLE, int, IPC::ContextMenuParams>
-  IPC::ContextMenuParams ctxmenu = { 711, 512, GURL("http://link_src"),
+  IPC::MiniContextMenuParams ctxmenu = { 711, 512, GURL("http://link_src"),
       GURL("http://unfiltered_link_url"), GURL("http://src_url"),
       GURL("http://page_url"), GURL("http://frame_url") };
   AutomationMsg_ForwardContextMenuToExternalHost m10(0, 1, HANDLE(7), 4,
                                                      ctxmenu);
   EXPECT_CALL(delegate, HandleContextMenu(HANDLE(7), 4,
                                           EqContextMenuParam(ctxmenu)));
   EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m10));
 
   // Tuple3<int, int, IPC::AutomationURLRequest>
   IPC::AutomationURLRequest url_request = {"url", "post", "referer",
@@ skipping 36 matching lines @@
 
   // Tuple3<int, GURL, int>
   AutomationMsg_GetCookiesFromHost m18(0, 1, url, 903);
   EXPECT_CALL(delegate, GetCookies(url, 903));
   EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m18));
 
   AutomationMsg_CloseExternalTab m19(0, 1);
   EXPECT_CALL(delegate, TabClosed());
   EXPECT_TRUE(DispatchTabMessageToDelegate(&delegate, m19));
 }