Index: chrome_frame/test/chrome_frame_automation_mock.h |
=================================================================== |
--- chrome_frame/test/chrome_frame_automation_mock.h (revision 42751) |
+++ chrome_frame/test/chrome_frame_automation_mock.h (working copy) |
@@ -22,7 +22,8 @@ |
AutomationMockDelegate(MessageLoop* caller_message_loop, |
int launch_timeout, bool perform_version_check, |
const std::wstring& profile_name, |
- const std::wstring& extra_chrome_arguments, bool incognito) |
+ const std::wstring& extra_chrome_arguments, bool incognito, |
+ bool is_widget_mode) |
: caller_message_loop_(caller_message_loop), is_connected_(false), |
navigation_result_(false) { |
test_server_.SetUp(); |
@@ -31,8 +32,18 @@ |
chrome_frame_test::GetProfilePath(profile_name)); |
automation_client_ = new ChromeFrameAutomationClient; |
- automation_client_->Initialize(this, launch_timeout, perform_version_check, |
- profile_path, extra_chrome_arguments, incognito); |
+ ChromeFrameLaunchParams clp = { |
+ launch_timeout, |
+ GURL(), |
+ GURL(), |
+ profile_path, |
+ profile_name, |
+ extra_chrome_arguments, |
+ perform_version_check, |
+ incognito, |
+ is_widget_mode |
+ }; |
+ automation_client_->Initialize(this, clp); |
} |
~AutomationMockDelegate() { |
if (automation_client_.get()) { |
@@ -136,7 +147,8 @@ |
typedef AutomationMockDelegate<AutomationMockLaunch> Base; |
AutomationMockLaunch(MessageLoop* caller_message_loop, |
int launch_timeout) |
- : Base(caller_message_loop, launch_timeout, true, L"", L"", false) { |
+ : Base(caller_message_loop, launch_timeout, true, L"", L"", false, |
+ false) { |
} |
virtual void OnAutomationServerReady() { |
Base::OnAutomationServerReady(); |
@@ -153,7 +165,8 @@ |
typedef AutomationMockDelegate<AutomationMockNavigate> Base; |
AutomationMockNavigate(MessageLoop* caller_message_loop, |
int launch_timeout) |
- : Base(caller_message_loop, launch_timeout, true, L"", L"", false) { |
+ : Base(caller_message_loop, launch_timeout, true, L"", L"", false, |
+ false) { |
} |
virtual void OnLoad(int tab_handle, const GURL& url) { |
Base::OnLoad(tab_handle, url); |
@@ -167,7 +180,7 @@ |
typedef AutomationMockDelegate<AutomationMockPostMessage> Base; |
AutomationMockPostMessage(MessageLoop* caller_message_loop, |
int launch_timeout) |
- : Base(caller_message_loop, launch_timeout, true, L"", L"", false), |
+ : Base(caller_message_loop, launch_timeout, true, L"", L"", false, false), |
postmessage_result_(false) {} |
bool postmessage_result() const { |
return postmessage_result_; |
@@ -195,7 +208,7 @@ |
typedef AutomationMockDelegate<AutomationMockHostNetworkRequestStart> Base; |
AutomationMockHostNetworkRequestStart(MessageLoop* caller_message_loop, |
int launch_timeout) |
- : Base(caller_message_loop, launch_timeout, true, L"", L"", false), |
+ : Base(caller_message_loop, launch_timeout, true, L"", L"", false, false), |
request_start_result_(false) { |
if (automation()) { |
automation()->set_use_chrome_network(false); |