diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-08 23:34:16 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-08 23:34:16 +0000 |
| commit | 21fa3a157739a857f1882072179f1bd3d978c368 (patch) | |
| tree | 731cee107cd53590baf4f6f97e273d5378e03e7e /chrome_frame/test | |
| parent | 6df403010254c73428c83e553654ce5dafa7dc00 (diff) | |
| download | chromium_src-21fa3a157739a857f1882072179f1bd3d978c368.zip chromium_src-21fa3a157739a857f1882072179f1bd3d978c368.tar.gz chromium_src-21fa3a157739a857f1882072179f1bd3d978c368.tar.bz2 | |
ipc: Simplify the magic required to create IPC message headers.This gets rid of having to include the files in a magic place because of xcode dependency issues, and just makes it simpler to create new IPC message classes. It also gets rid of including the X_messages_internal.h file multiple times, which simplifies things and should make the build a little faster.
In a future change, I will remove the "internal.h" files since they're no longer needed.
Review URL: http://codereview.chromium.org/5526008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
| -rw-r--r-- | chrome_frame/test/automation_client_mock.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome_frame/test/automation_client_mock.cc b/chrome_frame/test/automation_client_mock.cc index 2cf981b..48c5856 100644 --- a/chrome_frame/test/automation_client_mock.cc +++ b/chrome_frame/test/automation_client_mock.cc @@ -253,7 +253,7 @@ TEST_F(CFACMockTest, MockedCreateTabOk) { HWND h1 = ::GetDesktopWindow(); HWND h2 = ::GetDesktopWindow(); EXPECT_CALL(mock_proxy_, SendAsAsync(testing::Property( - &IPC::SyncMessage::type, AutomationMsg_CreateExternalTab__ID), + &IPC::SyncMessage::type, AutomationMsg_CreateExternalTab::ID), testing::NotNull(), _)) .Times(1).WillOnce(HandleCreateTab(tab_handle_, h1, h2, 99)); @@ -287,7 +287,7 @@ TEST_F(CFACMockTest, MockedCreateTabFailed) { .WillRepeatedly(Return("")); EXPECT_CALL(mock_proxy_, SendAsAsync(testing::Property( - &IPC::SyncMessage::type, AutomationMsg_CreateExternalTab__ID), + &IPC::SyncMessage::type, AutomationMsg_CreateExternalTab::ID), testing::NotNull(), _)) .Times(1).WillOnce(HandleCreateTab(tab_handle_, null_wnd, null_wnd, 99)); @@ -350,7 +350,7 @@ TEST_F(CFACMockTest, OnChannelError) { HWND h1 = ::GetDesktopWindow(); HWND h2 = ::GetDesktopWindow(); EXPECT_CALL(proxy, SendAsAsync(testing::Property( - &IPC::SyncMessage::type, AutomationMsg_CreateExternalTab__ID), + &IPC::SyncMessage::type, AutomationMsg_CreateExternalTab::ID), testing::NotNull(), _)).Times(3) .WillOnce(HandleCreateTab(tab_handle_, h1, h2, 99)) .WillOnce(HandleCreateTab(tab_handle_ * 2, h1, h2, 100)) @@ -430,7 +430,7 @@ TEST_F(CFACMockTest, NavigateTwiceAfterInitToSameUrl) { HWND h1 = ::GetDesktopWindow(); HWND h2 = ::GetDesktopWindow(); EXPECT_CALL(mock_proxy_, SendAsAsync(testing::Property( - &IPC::SyncMessage::type, AutomationMsg_CreateExternalTab__ID), + &IPC::SyncMessage::type, AutomationMsg_CreateExternalTab::ID), testing::NotNull(), _)) .Times(1).WillOnce(HandleCreateTab(tab_handle_, h1, h2, 99)); @@ -443,14 +443,14 @@ TEST_F(CFACMockTest, NavigateTwiceAfterInitToSameUrl) { std::string(), false)); EXPECT_CALL(mock_proxy_, SendAsAsync(testing::Property( - &IPC::SyncMessage::type, AutomationMsg_NavigateInExternalTab__ID), + &IPC::SyncMessage::type, AutomationMsg_NavigateInExternalTab::ID), testing::NotNull(), _)) .Times(1).WillOnce(QUIT_LOOP(loop_)); EXPECT_CALL(mock_proxy_, CancelAsync(_)).Times(testing::AnyNumber()); EXPECT_CALL(mock_proxy_, Send( - testing::Property(&IPC::Message::type, AutomationMsg_TabReposition__ID))) + testing::Property(&IPC::Message::type, AutomationMsg_TabReposition::ID))) .Times(1) .WillOnce(Return(true)); |