Index: chrome_frame/test/chrome_frame_automation_mock.h |
=================================================================== |
--- chrome_frame/test/chrome_frame_automation_mock.h (revision 115109) |
+++ chrome_frame/test/chrome_frame_automation_mock.h (working copy) |
@@ -27,8 +27,7 @@ |
int launch_timeout, bool perform_version_check, |
const std::wstring& profile_name, |
const std::wstring& language, |
- const std::wstring& extra_chrome_arguments, bool incognito, |
- bool is_widget_mode) |
+ bool incognito, bool is_widget_mode) |
: caller_message_loop_(caller_message_loop), is_connected_(false), |
navigation_result_(false), |
mock_server_(1337, L"127.0.0.1", |
@@ -48,8 +47,7 @@ |
GURL empty; |
scoped_refptr<ChromeFrameLaunchParams> clp( |
new ChromeFrameLaunchParams(empty, empty, profile_path, profile_name, |
- language, extra_chrome_arguments, incognito, is_widget_mode, |
- false)); |
+ language, incognito, is_widget_mode, false)); |
clp->set_launch_timeout(launch_timeout); |
clp->set_version_check(perform_version_check); |
automation_client_->Initialize(this, clp); |
@@ -154,7 +152,7 @@ |
typedef AutomationMockDelegate<AutomationMockLaunch> Base; |
AutomationMockLaunch(MessageLoop* caller_message_loop, |
int launch_timeout) |
- : Base(caller_message_loop, launch_timeout, true, L"", L"", L"", false, |
+ : Base(caller_message_loop, launch_timeout, true, L"", L"", false, |
false) { |
} |
virtual void OnAutomationServerReady() { |
@@ -172,7 +170,7 @@ |
typedef AutomationMockDelegate<AutomationMockNavigate> Base; |
AutomationMockNavigate(MessageLoop* caller_message_loop, |
int launch_timeout) |
- : Base(caller_message_loop, launch_timeout, true, L"", L"", L"", false, |
+ : Base(caller_message_loop, launch_timeout, true, L"", L"", false, |
false) { |
} |
virtual void OnLoad(const GURL& url) { |
@@ -187,7 +185,7 @@ |
typedef AutomationMockDelegate<AutomationMockPostMessage> Base; |
AutomationMockPostMessage(MessageLoop* caller_message_loop, |
int launch_timeout) |
- : Base(caller_message_loop, launch_timeout, true, L"", L"", L"", false, |
+ : Base(caller_message_loop, launch_timeout, true, L"", L"", false, |
false), |
postmessage_result_(false) {} |
bool postmessage_result() const { |
@@ -215,7 +213,7 @@ |
typedef AutomationMockDelegate<AutomationMockHostNetworkRequestStart> Base; |
AutomationMockHostNetworkRequestStart(MessageLoop* caller_message_loop, |
int launch_timeout) |
- : Base(caller_message_loop, launch_timeout, true, L"", L"", L"", false, |
+ : Base(caller_message_loop, launch_timeout, true, L"", L"", false, |
false), |
request_start_result_(false) { |
if (automation()) { |