Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Side by Side Diff: chrome_frame/test/chrome_frame_automation_mock.h

Issue 10197011: Share the "get CF profile dir" code between ChromeFramePlugin and chrome_frame_test_utils.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 4
5 #ifndef CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_ 5 #ifndef CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_
6 #define CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_ 6 #define CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 23 matching lines...) Expand all
34 mock_server_(1337, L"127.0.0.1", 34 mock_server_(1337, L"127.0.0.1",
35 chrome_frame_test::GetTestDataFolder()) { 35 chrome_frame_test::GetTestDataFolder()) {
36 36
37 // Endeavour to only kill off Chrome Frame derived Chrome processes. 37 // Endeavour to only kill off Chrome Frame derived Chrome processes.
38 KillAllNamedProcessesWithArgument( 38 KillAllNamedProcessesWithArgument(
39 UTF8ToWide(chrome_frame_test::kChromeImageName), 39 UTF8ToWide(chrome_frame_test::kChromeImageName),
40 UTF8ToWide(switches::kChromeFrame)); 40 UTF8ToWide(switches::kChromeFrame));
41 41
42 mock_server_.ExpectAndServeAnyRequests(CFInvocation(CFInvocation::NONE)); 42 mock_server_.ExpectAndServeAnyRequests(CFInvocation(CFInvocation::NONE));
43 43
44 FilePath profile_path( 44 FilePath profile_path;
45 chrome_frame_test::GetProfilePath(profile_name)); 45 GetChromeFrameProfilePath(profile_name, &profile_path);
46 chrome_frame_test::OverrideDataDirectoryForThisTest(profile_path.value()); 46 chrome_frame_test::OverrideDataDirectoryForThisTest(profile_path.value());
47 47
48 automation_client_ = new ChromeFrameAutomationClient; 48 automation_client_ = new ChromeFrameAutomationClient;
49 GURL empty; 49 GURL empty;
50 scoped_refptr<ChromeFrameLaunchParams> clp( 50 scoped_refptr<ChromeFrameLaunchParams> clp(
51 new ChromeFrameLaunchParams(empty, empty, profile_path, profile_name, 51 new ChromeFrameLaunchParams(empty, empty, profile_path, profile_name,
52 language, incognito, is_widget_mode, false, false)); 52 language, incognito, is_widget_mode, false, false));
53 clp->set_launch_timeout(launch_timeout); 53 clp->set_launch_timeout(launch_timeout);
54 clp->set_version_check(perform_version_check); 54 clp->set_version_check(perform_version_check);
55 automation_client_->Initialize(this, clp); 55 automation_client_->Initialize(this, clp);
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 QuitMessageLoop(); 231 QuitMessageLoop();
232 } 232 }
233 virtual void OnLoad(const GURL& url) { 233 virtual void OnLoad(const GURL& url) {
234 Base::OnLoad(url); 234 Base::OnLoad(url);
235 } 235 }
236 private: 236 private:
237 bool request_start_result_; 237 bool request_start_result_;
238 }; 238 };
239 239
240 #endif // CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_ 240 #endif // CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_
OLDNEW
« no previous file with comments | « chrome_frame/test/automation_client_mock.cc ('k') | chrome_frame/test/chrome_frame_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698