OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 #include "chrome_frame/test/automation_client_mock.h" | 4 #include "chrome_frame/test/automation_client_mock.h" |
5 | 5 |
6 #include "base/callback.h" | 6 #include "base/callback.h" |
7 #include "chrome_frame/custom_sync_call_context.h" | 7 #include "chrome_frame/custom_sync_call_context.h" |
8 #include "chrome_frame/navigation_constraints.h" | 8 #include "chrome_frame/navigation_constraints.h" |
9 #include "chrome_frame/test/chrome_frame_test_utils.h" | 9 #include "chrome_frame/test/chrome_frame_test_utils.h" |
10 #include "net/base/net_errors.h" | 10 #include "net/base/net_errors.h" |
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
313 EXPECT_TRUE(client_->Initialize(&cfd_, clp)); | 313 EXPECT_TRUE(client_->Initialize(&cfd_, clp)); |
314 loop_.RunFor(4); | 314 loop_.RunFor(4); |
315 client_->Uninitialize(); | 315 client_->Uninitialize(); |
316 } | 316 } |
317 | 317 |
318 class TestChromeFrameAutomationProxyImpl | 318 class TestChromeFrameAutomationProxyImpl |
319 : public ChromeFrameAutomationProxyImpl { | 319 : public ChromeFrameAutomationProxyImpl { |
320 public: | 320 public: |
321 TestChromeFrameAutomationProxyImpl() | 321 TestChromeFrameAutomationProxyImpl() |
322 // 1 is an unneeded timeout. | 322 // 1 is an unneeded timeout. |
323 : ChromeFrameAutomationProxyImpl(NULL, 1) { | 323 : ChromeFrameAutomationProxyImpl( |
| 324 NULL, AutomationProxy::GenerateChannelID(), 1) { |
324 } | 325 } |
325 MOCK_METHOD3( | 326 MOCK_METHOD3( |
326 SendAsAsync, | 327 SendAsAsync, |
327 void(IPC::SyncMessage* msg, | 328 void(IPC::SyncMessage* msg, |
328 SyncMessageReplyDispatcher::SyncMessageCallContext* context, | 329 SyncMessageReplyDispatcher::SyncMessageCallContext* context, |
329 void* key)); | 330 void* key)); |
330 void FakeChannelError() { | 331 void FakeChannelError() { |
331 reinterpret_cast<IPC::ChannelProxy::MessageFilter*>(message_filter_.get())-> | 332 reinterpret_cast<IPC::ChannelProxy::MessageFilter*>(message_filter_.get())-> |
332 OnChannelError(); | 333 OnChannelError(); |
333 } | 334 } |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
469 GURL("http://www.nonexistent.com"), empty, profile_path_, | 470 GURL("http://www.nonexistent.com"), empty, profile_path_, |
470 profile_path_.BaseName().value(), L"", L"", false, false, false)); | 471 profile_path_.BaseName().value(), L"", L"", false, false, false)); |
471 launch_params->set_launch_timeout(timeout); | 472 launch_params->set_launch_timeout(timeout); |
472 launch_params->set_version_check(false); | 473 launch_params->set_version_check(false); |
473 EXPECT_TRUE(client_->Initialize(&cfd_, launch_params)); | 474 EXPECT_TRUE(client_->Initialize(&cfd_, launch_params)); |
474 loop_.RunFor(10); | 475 loop_.RunFor(10); |
475 | 476 |
476 EXPECT_CALL(mock_proxy_, ReleaseTabProxy(testing::Eq(tab_handle_))).Times(1); | 477 EXPECT_CALL(mock_proxy_, ReleaseTabProxy(testing::Eq(tab_handle_))).Times(1); |
477 client_->Uninitialize(); | 478 client_->Uninitialize(); |
478 } | 479 } |
479 | |
OLD | NEW |