diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 22:20:44 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 22:20:44 +0000 |
| commit | cf5912b5bacc1f615416be25b61c7126f06ee403 (patch) | |
| tree | 7fa99900977e96201105f548599e5991a326b8db /chrome_frame/test/chrome_frame_test_utils.cc | |
| parent | 2a3851ec96ce92e9d51ef2737bf8a7137dad49e3 (diff) | |
| download | chromium_src-cf5912b5bacc1f615416be25b61c7126f06ee403.zip chromium_src-cf5912b5bacc1f615416be25b61c7126f06ee403.tar.gz chromium_src-cf5912b5bacc1f615416be25b61c7126f06ee403.tar.bz2 | |
Added support for running per user chrome frame tests on the relevant ChromeFrame builders.
This includes the chrome_frame_net_tests, chrome_frame_tests and the chrome_frame_unittests
test suites.
We determine whether per user tests are to be run based on a registry config value PerUserTestBed
under HKCU\Software\Google\ChromeFrame.
As part of this CL we also register chrome frame in the chrome frame net tests suite.
We unregister the chrome frame dll on the builder for per user installs after every test run.
BUG=none
TEST=Existing chrome frame tests.
Review URL: http://codereview.chromium.org/6347056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73354 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/chrome_frame_test_utils.cc')
| -rw-r--r-- | chrome_frame/test/chrome_frame_test_utils.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc index 85ecc5b..17f4483 100644 --- a/chrome_frame/test/chrome_frame_test_utils.cc +++ b/chrome_frame/test/chrome_frame_test_utils.cc @@ -672,4 +672,12 @@ bool KillProcesses(const std::wstring& executable_name, int exit_code, return result; } +ScopedChromeFrameRegistrar::RegistrationType GetTestBedType() { + if (GetConfigBool(false, L"PerUserTestBed")) { + return ScopedChromeFrameRegistrar::PER_USER; + } else { + return ScopedChromeFrameRegistrar::SYSTEM_LEVEL; + } +} + } // namespace chrome_frame_test |