diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-01 19:24:33 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-01 19:24:33 +0000 |
| commit | ea1c18e1bf3bbe6d9bb7bb8769142e5f0429293a (patch) | |
| tree | 1c0a736b831d15b4e250c41c471791368ecbef6a /chrome_frame/external_tab_test.cc | |
| parent | 8898ec205da3a100d12ff5ddb64eab993de3cf67 (diff) | |
| download | chromium_src-ea1c18e1bf3bbe6d9bb7bb8769142e5f0429293a.zip chromium_src-ea1c18e1bf3bbe6d9bb7bb8769142e5f0429293a.tar.gz chromium_src-ea1c18e1bf3bbe6d9bb7bb8769142e5f0429293a.tar.bz2 | |
Revert "Refactor automation messages." due to mysterious problems on mac.
This reverts commit c1c1fed998ee4d839bfe256150e5e59220ebc0ef (r64637).
TBR=nirnimesh@
BUG=51409
TEST=none
Review URL: http://codereview.chromium.org/4194007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/external_tab_test.cc')
| -rw-r--r-- | chrome_frame/external_tab_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/external_tab_test.cc b/chrome_frame/external_tab_test.cc index 1448c34..0e49f95 100644 --- a/chrome_frame/external_tab_test.cc +++ b/chrome_frame/external_tab_test.cc @@ -9,7 +9,7 @@ // #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" @@ -41,7 +41,7 @@ struct MockUIDelegate : public UIDelegate { 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)); |