OLD | NEW |
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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 #ifndef CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_ | 4 #ifndef CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_ |
5 #define CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_ | 5 #define CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_ |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 22 matching lines...) Expand all Loading... |
33 | 33 |
34 mock_server_.ExpectAndServeAnyRequests(CFInvocation(CFInvocation::NONE)); | 34 mock_server_.ExpectAndServeAnyRequests(CFInvocation(CFInvocation::NONE)); |
35 | 35 |
36 FilePath profile_path( | 36 FilePath profile_path( |
37 chrome_frame_test::GetProfilePath(profile_name)); | 37 chrome_frame_test::GetProfilePath(profile_name)); |
38 | 38 |
39 automation_client_ = new ChromeFrameAutomationClient; | 39 automation_client_ = new ChromeFrameAutomationClient; |
40 GURL empty; | 40 GURL empty; |
41 scoped_refptr<ChromeFrameLaunchParams> clp( | 41 scoped_refptr<ChromeFrameLaunchParams> clp( |
42 new ChromeFrameLaunchParams(empty, empty, profile_path, profile_name, | 42 new ChromeFrameLaunchParams(empty, empty, profile_path, profile_name, |
43 extra_chrome_arguments, incognito, is_widget_mode)); | 43 extra_chrome_arguments, incognito, is_widget_mode, false)); |
44 clp->set_launch_timeout(launch_timeout); | 44 clp->set_launch_timeout(launch_timeout); |
45 clp->set_version_check(perform_version_check); | 45 clp->set_version_check(perform_version_check); |
46 automation_client_->Initialize(this, clp); | 46 automation_client_->Initialize(this, clp); |
47 } | 47 } |
48 ~AutomationMockDelegate() { | 48 ~AutomationMockDelegate() { |
49 if (automation_client_.get()) { | 49 if (automation_client_.get()) { |
50 automation_client_->Uninitialize(); | 50 automation_client_->Uninitialize(); |
51 automation_client_ = NULL; | 51 automation_client_ = NULL; |
52 } | 52 } |
53 if (IsWindow()) | 53 if (IsWindow()) |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 virtual void OnLoad(int tab_handle, const GURL& url) { | 223 virtual void OnLoad(int tab_handle, const GURL& url) { |
224 Base::OnLoad(tab_handle, url); | 224 Base::OnLoad(tab_handle, url); |
225 } | 225 } |
226 private: | 226 private: |
227 bool request_start_result_; | 227 bool request_start_result_; |
228 }; | 228 }; |
229 | 229 |
230 | 230 |
231 #endif // CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_ | 231 #endif // CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_ |
232 | 232 |
OLD | NEW |