diff options
Diffstat (limited to 'chrome_frame/test')
| -rw-r--r-- | chrome_frame/test/automation_client_mock.cc | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/chrome_frame/test/automation_client_mock.cc b/chrome_frame/test/automation_client_mock.cc index 7e8f317..a77b023 100644 --- a/chrome_frame/test/automation_client_mock.cc +++ b/chrome_frame/test/automation_client_mock.cc @@ -70,15 +70,13 @@ MATCHER_P(EqNavigationInfoUrl, url, "IPC::NavigationInfo matcher") { } // Could be implemented as MockAutomationProxy member (we have WithArgs<>!) -ACTION_P4(HandleCreateTab, tab_handle, external_tab_container, tab_wnd, - session_id) { +ACTION_P3(HandleCreateTab, tab_handle, external_tab_container, tab_wnd) { // arg0 - message // arg1 - callback // arg2 - key CreateExternalTabContext::output_type input_args(tab_wnd, external_tab_container, - tab_handle, - session_id); + tab_handle); CreateExternalTabContext* context = reinterpret_cast<CreateExternalTabContext*>(arg1); DispatchToMethod(context, &CreateExternalTabContext::Completed, input_args); @@ -255,7 +253,7 @@ TEST_F(CFACMockTest, MockedCreateTabOk) { EXPECT_CALL(mock_proxy_, SendAsAsync(testing::Property( &IPC::SyncMessage::type, AutomationMsg_CreateExternalTab__ID), testing::NotNull(), _)) - .Times(1).WillOnce(HandleCreateTab(tab_handle_, h1, h2, 99)); + .Times(1).WillOnce(HandleCreateTab(tab_handle_, h1, h2)); EXPECT_CALL(mock_proxy_, CreateTabProxy(testing::Eq(tab_handle_))) .WillOnce(Return(tab_)); @@ -289,8 +287,7 @@ TEST_F(CFACMockTest, MockedCreateTabFailed) { EXPECT_CALL(mock_proxy_, SendAsAsync(testing::Property( &IPC::SyncMessage::type, AutomationMsg_CreateExternalTab__ID), testing::NotNull(), _)) - .Times(1).WillOnce(HandleCreateTab(tab_handle_, null_wnd, null_wnd, - 99)); + .Times(1).WillOnce(HandleCreateTab(tab_handle_, null_wnd, null_wnd)); EXPECT_CALL(mock_proxy_, CreateTabProxy(_)).Times(0); @@ -351,9 +348,9 @@ TEST_F(CFACMockTest, OnChannelError) { EXPECT_CALL(proxy, SendAsAsync(testing::Property( &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)) - .WillOnce(HandleCreateTab(tab_handle_ * 3, h1, h2, 101)); + .WillOnce(HandleCreateTab(tab_handle_, h1, h2)) + .WillOnce(HandleCreateTab(tab_handle_ * 2, h1, h2)) + .WillOnce(HandleCreateTab(tab_handle_ * 3, h1, h2)); SetAutomationServerOk(3); @@ -431,7 +428,7 @@ TEST_F(CFACMockTest, NavigateTwiceAfterInitToSameUrl) { EXPECT_CALL(mock_proxy_, SendAsAsync(testing::Property( &IPC::SyncMessage::type, AutomationMsg_CreateExternalTab__ID), testing::NotNull(), _)) - .Times(1).WillOnce(HandleCreateTab(tab_handle_, h1, h2, 99)); + .Times(1).WillOnce(HandleCreateTab(tab_handle_, h1, h2)); EXPECT_CALL(mock_proxy_, CreateTabProxy(testing::Eq(tab_handle_))) .WillOnce(Return(tab_)); |