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

chrome_frame/external_tab_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 "chrome_frame/external_tab.h"
 #include "base/task.h"
 #include "base/thread.h"
 #include "base/tracked.h"
 
 // #include "base/waitable_event.h"
 
-#include "chrome/common/automation_messages.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"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 
 
 
 // DISABLE_RUNNABLE_METHOD_REFCOUNT(ExternalTabProxy);
 // DISABLE_RUNNABLE_METHOD_REFCOUNT(UIDelegate);
 DISABLE_RUNNABLE_METHOD_REFCOUNT(ChromeProxyDelegate);
@@ skipping 11 matching lines @@
 struct MockUIDelegate : public UIDelegate {
   MOCK_METHOD2(OnNavigationStateChanged, void(int flags,
       const IPC::NavigationInfo& nav_info));
   MOCK_METHOD1(OnUpdateTargetUrl, void(const std::wstring& new_target_url));
   MOCK_METHOD3(OnExtensionInstalled, void(const FilePath& path, void* user_data,
       AutomationMsg_ExtensionResponseValues response));
   MOCK_METHOD1(OnLoad, void(const GURL& url));
   MOCK_METHOD3(OnMessageFromChromeFrame, void(const std::string& message,
       const std::string& origin, const std::string& target));
   MOCK_METHOD3(OnHandleContextMenu, void(HANDLE menu_handle, int align_flags,
-      const IPC::MiniContextMenuParams& params));
+      const IPC::ContextMenuParams& params));
   MOCK_METHOD1(OnHandleAccelerator, void(const MSG& accel_message));
   MOCK_METHOD1(OnTabbedOut, void(bool reverse));
   MOCK_METHOD1(OnGoToHistoryOffset, void(int offset));
   MOCK_METHOD3(OnOpenURL, void(const GURL& url_to_open, const GURL& referrer,
       int open_disposition));
 };
 
 struct MockProxy : public ChromeProxy {
   MOCK_METHOD1(RemoveBrowsingData, void(int remove_mask));
   MOCK_METHOD3(InstallExtension, void(ChromeProxyDelegate* delegate,
@@ skipping 180 matching lines @@
   tab_params.is_widget_mode = false;
   tab_params.url = initial_url;
 
   tab->CreateTab(tab_params, &ui_delegate);
   tab->Navigate("http://asgard.org", EmptyString(), true);
 
   loop.RunFor(5);
   EXPECT_FALSE(loop.WasTimedOut());
   tab.reset();
 }