Set ChromeFrame unpinned mode for the duration of the perf tests to ensure that the dll unloads correctly

after every test.

Review URL: http://codereview.chromium.org/2813039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51147 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 4 deletions

diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc
index b65bafd..e22b143 100644
--- a/chrome_frame/test/perf/chrome_frame_perftest.cc
+++ b/chrome_frame/test/perf/chrome_frame_perftest.cc
@@ -282,7 +282,6 @@ class ChromeFrameStartupTest : public ChromeFramePerfTestBase {
   ChromeFrameStartupTest() {}
 
   virtual void SetUp() {
-    SetConfigBool(kChromeFrameUnpinnedMode, true);
     ASSERT_TRUE(PathService::Get(chrome::DIR_APP, &dir_app_));
 
     chrome_dll_ = dir_app_.Append(FILE_PATH_LITERAL("chrome.dll"));
@@ -297,9 +296,6 @@ class ChromeFrameStartupTest : public ChromeFramePerfTestBase {
     avformat52_dll_ = dir_app_.Append(FILE_PATH_LITERAL("avformat-52.dll"));
     avutil50_dll_ = dir_app_.Append(FILE_PATH_LITERAL("avutil-50.dll"));
   }
-  virtual void TearDown() {
-    DeleteConfigValue(kChromeFrameUnpinnedMode);
-  }
 
   // TODO(iyengar)
   // This function is similar to the RunStartupTest function used in chrome
diff --git a/chrome_frame/test/perf/run_all.cc b/chrome_frame/test/perf/run_all.cc
index 25ffcd3..a5f4738 100644
--- a/chrome_frame/test/perf/run_all.cc
+++ b/chrome_frame/test/perf/run_all.cc
@@ -15,6 +15,8 @@ int main(int argc, char **argv) {
   PlatformThread::SetName("ChromeFrame perf tests");
 
   SetConfigBool(kChromeFrameHeadlessMode, true);
+  SetConfigBool(kChromeFrameUnpinnedMode, true);
+
   base::ProcessHandle crash_service = chrome_frame_test::StartCrashService();
 
   // Use ctor/raii to register the local Chrome Frame dll.
@@ -23,6 +25,8 @@ int main(int argc, char **argv) {
   int ret = perf_suite.Run();
 
   DeleteConfigValue(kChromeFrameHeadlessMode);
+  DeleteConfigValue(kChromeFrameUnpinnedMode);
+
   if (crash_service)
     base::KillProcess(crash_service, 0, false);
   return ret;