diff options
Diffstat (limited to 'chrome_frame/test/perf')
| -rw-r--r-- | chrome_frame/test/perf/chrome_frame_perftest.cc | 15 | ||||
| -rw-r--r-- | chrome_frame/test/perf/run_all.cc | 3 |
2 files changed, 12 insertions, 6 deletions
diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc index 2f645d2..e83bf65 100644 --- a/chrome_frame/test/perf/chrome_frame_perftest.cc +++ b/chrome_frame/test/perf/chrome_frame_perftest.cc @@ -389,7 +389,8 @@ class ChromeFrameStartupTestActiveX : public ChromeFrameStartupTest { public: virtual void SetUp() { // Register the Chrome Frame DLL in the build directory. - chrome_frame_registrar_.reset(new ScopedChromeFrameRegistrar); + chrome_frame_registrar_.reset(new ScopedChromeFrameRegistrar( + ScopedChromeFrameRegistrar::SYSTEM_LEVEL)); ChromeFrameStartupTest::SetUp(); } @@ -457,7 +458,8 @@ class ChromeFrameStartupTestActiveXReference // override the browser directory to use the reference build instead. virtual void SetUp() { // Register the reference build Chrome Frame DLL. - chrome_frame_registrar_.reset(new ScopedChromeFrameRegistrar); + chrome_frame_registrar_.reset(new ScopedChromeFrameRegistrar( + ScopedChromeFrameRegistrar::SYSTEM_LEVEL)); chrome_frame_registrar_->RegisterReferenceChromeFrameBuild(); ChromeFrameStartupTest::SetUp(); @@ -567,7 +569,8 @@ class ChromeFrameMemoryTest : public ChromeFramePerfTestBase { virtual void SetUp() { // Register the Chrome Frame DLL in the build directory. - chrome_frame_registrar_.reset(new ScopedChromeFrameRegistrar); + chrome_frame_registrar_.reset(new ScopedChromeFrameRegistrar( + ScopedChromeFrameRegistrar::SYSTEM_LEVEL)); } void RunTest(const char* test_name, char* urls[], int total_urls) { @@ -748,7 +751,8 @@ class ChromeFrameMemoryTest : public ChromeFramePerfTestBase { class ChromeFrameMemoryTestReference : public ChromeFrameMemoryTest { public: virtual void SetUp() { - chrome_frame_registrar_.reset(new ScopedChromeFrameRegistrar); + chrome_frame_registrar_.reset(new ScopedChromeFrameRegistrar( + ScopedChromeFrameRegistrar::SYSTEM_LEVEL)); chrome_frame_registrar_->RegisterReferenceChromeFrameBuild(); } @@ -872,7 +876,8 @@ class ChromeFrameCreationTestReference : public ChromeFrameCreationTest { public: // override the browser directory to use the reference build instead. virtual void SetUp() { - chrome_frame_registrar_.reset(new ScopedChromeFrameRegistrar); + chrome_frame_registrar_.reset(new ScopedChromeFrameRegistrar( + ScopedChromeFrameRegistrar::SYSTEM_LEVEL)); chrome_frame_registrar_->RegisterReferenceChromeFrameBuild(); ChromeFrameStartupTest::SetUp(); } diff --git a/chrome_frame/test/perf/run_all.cc b/chrome_frame/test/perf/run_all.cc index 7d66299..3b29280 100644 --- a/chrome_frame/test/perf/run_all.cc +++ b/chrome_frame/test/perf/run_all.cc @@ -28,7 +28,8 @@ int main(int argc, char **argv) { // Use ctor/raii to register the local Chrome Frame dll. scoped_ptr<ScopedChromeFrameRegistrar> registrar( - new ScopedChromeFrameRegistrar); + new ScopedChromeFrameRegistrar( + ScopedChromeFrameRegistrar::SYSTEM_LEVEL)); int ret = perf_suite.Run(); DeleteConfigValue(kChromeFrameHeadlessMode); |