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

Side by Side Diff: chrome_frame/test/chrome_frame_test_utils.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_TEST_UTILS_H_ 5 #ifndef CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_
6 #define CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_ 6 #define CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_
7 7
8 #include <windows.h> 8 #include <windows.h>
9 9
10 #include <atlbase.h> 10 #include <atlbase.h>
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 274
275 #define QUIT_LOOP_SOON(loop, delay) testing::InvokeWithoutArgs(\ 275 #define QUIT_LOOP_SOON(loop, delay) testing::InvokeWithoutArgs(\
276 testing::CreateFunctor(&loop, &chrome_frame_test::TimedMsgLoop::QuitAfter, \ 276 testing::CreateFunctor(&loop, &chrome_frame_test::TimedMsgLoop::QuitAfter, \
277 delay)) 277 delay))
278 278
279 // Launches IE as a COM server and returns the corresponding IWebBrowser2 279 // Launches IE as a COM server and returns the corresponding IWebBrowser2
280 // interface pointer. 280 // interface pointer.
281 // Returns S_OK on success. 281 // Returns S_OK on success.
282 HRESULT LaunchIEAsComServer(IWebBrowser2** web_browser); 282 HRESULT LaunchIEAsComServer(IWebBrowser2** web_browser);
283 283
284 FilePath GetProfilePath(const std::wstring& suffix);
285
286 // Returns the path of the exe passed in. 284 // Returns the path of the exe passed in.
287 std::wstring GetExecutableAppPath(const std::wstring& file); 285 std::wstring GetExecutableAppPath(const std::wstring& file);
288 286
289 // Returns the profile path to be used for IE. This varies as per version. 287 // Returns the profile path to be used for IE. This varies as per version.
290 FilePath GetProfilePathForIE(); 288 FilePath GetProfilePathForIE();
291 289
292 // Returns the version of the exe passed in. 290 // Returns the version of the exe passed in.
293 std::wstring GetExeVersion(const std::wstring& exe_path); 291 std::wstring GetExeVersion(const std::wstring& exe_path);
294 292
295 // Returns the version of Internet Explorer on the machine. 293 // Returns the version of Internet Explorer on the machine.
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 } // namespace chrome_frame_test 373 } // namespace chrome_frame_test
376 374
377 // TODO(tommi): This is a temporary workaround while we're getting our 375 // TODO(tommi): This is a temporary workaround while we're getting our
378 // Singleton story straight. Ideally each test should clear up any singletons 376 // Singleton story straight. Ideally each test should clear up any singletons
379 // it might have created, but test cases do not implicitly have their own 377 // it might have created, but test cases do not implicitly have their own
380 // AtExitManager, so we have this workaround method for tests that depend on 378 // AtExitManager, so we have this workaround method for tests that depend on
381 // "fresh" singletons. The implementation is in chrome_frame_unittest_main.cc. 379 // "fresh" singletons. The implementation is in chrome_frame_unittest_main.cc.
382 void DeleteAllSingletons(); 380 void DeleteAllSingletons();
383 381
384 #endif // CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_ 382 #endif // CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_
OLDNEW
« no previous file with comments | « chrome_frame/test/chrome_frame_automation_mock.h ('k') | chrome_frame/test/chrome_frame_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698