summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/run_all_unittests.cc
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-01 22:20:44 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-01 22:20:44 +0000
commitcf5912b5bacc1f615416be25b61c7126f06ee403 (patch)
tree7fa99900977e96201105f548599e5991a326b8db /chrome_frame/test/run_all_unittests.cc
parent2a3851ec96ce92e9d51ef2737bf8a7137dad49e3 (diff)
downloadchromium_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/run_all_unittests.cc')
-rw-r--r--chrome_frame/test/run_all_unittests.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/test/run_all_unittests.cc b/chrome_frame/test/run_all_unittests.cc
index 6fb4176..54129a2 100644
--- a/chrome_frame/test/run_all_unittests.cc
+++ b/chrome_frame/test/run_all_unittests.cc
@@ -81,12 +81,12 @@ int main(int argc, char **argv) {
// AtExitManager.
// TODO(robertshield): Make these tests restore the original registration
// once done.
- ScopedChromeFrameRegistrar registrar;
+ ScopedChromeFrameRegistrar registrar(chrome_frame_test::GetTestBedType());
// Register IAccessible2 proxy stub DLL, needed for some tests.
ScopedChromeFrameRegistrar ia2_registrar(
- chrome_frame_test::GetIAccessible2ProxyStubPath().value());
-
+ chrome_frame_test::GetIAccessible2ProxyStubPath().value(),
+ ScopedChromeFrameRegistrar::SYSTEM_LEVEL);
ret = test_suite.Run();
}