diff options
Diffstat (limited to 'chrome_frame/test')
-rw-r--r-- | chrome_frame/test/automation_client_mock.cc | 4 | ||||
-rw-r--r-- | chrome_frame/test/net/test_automation_provider.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/test/automation_client_mock.cc b/chrome_frame/test/automation_client_mock.cc index 7e8f317..2cf981b 100644 --- a/chrome_frame/test/automation_client_mock.cc +++ b/chrome_frame/test/automation_client_mock.cc @@ -315,7 +315,8 @@ class TestChromeFrameAutomationProxyImpl public: TestChromeFrameAutomationProxyImpl() // 1 is an unneeded timeout. - : ChromeFrameAutomationProxyImpl(NULL, 1) { + : ChromeFrameAutomationProxyImpl( + NULL, AutomationProxy::GenerateChannelID(), 1) { } MOCK_METHOD3( SendAsAsync, @@ -469,4 +470,3 @@ TEST_F(CFACMockTest, NavigateTwiceAfterInitToSameUrl) { EXPECT_CALL(mock_proxy_, ReleaseTabProxy(testing::Eq(tab_handle_))).Times(1); client_->Uninitialize(); } - diff --git a/chrome_frame/test/net/test_automation_provider.cc b/chrome_frame/test/net/test_automation_provider.cc index 5b8a9a6..d6a0676 100644 --- a/chrome_frame/test/net/test_automation_provider.cc +++ b/chrome_frame/test/net/test_automation_provider.cc @@ -119,7 +119,7 @@ TestAutomationProvider* TestAutomationProvider::NewAutomationProvider( Profile* p, const std::string& channel, TestAutomationProviderDelegate* delegate) { TestAutomationProvider* automation = new TestAutomationProvider(p, delegate); - automation->ConnectToChannel(channel); + automation->InitializeChannel(channel); automation->SetExpectedTabCount(1); return automation; } |