Fixes GCF perf tests in prep for re-enabling them on the bots.

BUG=36734
TEST=build/run chrome_frame_perftests.exe, note that they all run now

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

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

1 files changed, 10 insertions, 33 deletions

diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc
index 1627b13..2433239 100644
--- a/chrome_frame/test/perf/chrome_frame_perftest.cc
+++ b/chrome_frame/test/perf/chrome_frame_perftest.cc
@@ -281,16 +281,20 @@ 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"));
     chrome_exe_ = dir_app_.Append(
         FilePath::FromWStringHack(chrome::kBrowserProcessExecutableName));
     chrome_frame_dll_ = dir_app_.Append(FILE_PATH_LITERAL("servers"));
-    chrome_frame_dll_ = dir_app_.Append(
+    chrome_frame_dll_ = chrome_frame_dll_.Append(
         FilePath::FromWStringHack(kChromeFrameDllName));
+    DLOG(INFO) << __FUNCTION__ << ": " << chrome_frame_dll_.value();
+  }
+  virtual void TearDown() {
+    DeleteConfigValue(kChromeFrameUnpinnedMode);
   }
-  virtual void TearDown() {}
 
   // TODO(iyengar)
   // This function is similar to the RunStartupTest function used in chrome
@@ -430,8 +434,10 @@ class ChromeFrameStartupTestActiveXReference
     chrome_frame_registrar_->RegisterReferenceChromeFrameBuild();
 
     ChromeFrameStartupTest::SetUp();
-    chrome_frame_dll_ = FilePath::FromWStringHack(
-        chrome_frame_registrar_->GetChromeFrameDllPath());
+
+    chrome_frame_dll_ = FilePath(
+        chrome_frame_registrar_->GetReferenceChromeFrameDllPath());
+    DLOG(INFO) << __FUNCTION__ << ": " << chrome_frame_dll_.value();
   }
 
   virtual void TearDown() {
@@ -582,35 +588,6 @@ class ChromeFrameMemoryTest : public ChromeFramePerfTestBase {
     return true;
   }
 
-  // Returns the path of the current chrome.exe being used by this test.
-  // This could return the regular chrome path or that of the reference
-  // build.
-  std::wstring GetChromeExePath() {
-    std::wstring chrome_exe_path =
-        chrome_frame_registrar_->GetChromeFrameDllPath();
-    EXPECT_FALSE(chrome_exe_path.empty());
-
-    file_util::UpOneDirectory(&chrome_exe_path);
-
-    std::wstring chrome_exe_test_path = chrome_exe_path;
-    file_util::AppendToPath(&chrome_exe_test_path,
-                            chrome::kBrowserProcessExecutableName);
-
-    if (!file_util::PathExists(
-        FilePath::FromWStringHack(chrome_exe_test_path))) {
-      file_util::UpOneDirectory(&chrome_exe_path);
-
-      chrome_exe_test_path = chrome_exe_path;
-      file_util::AppendToPath(&chrome_exe_test_path,
-                              chrome::kBrowserProcessExecutableName);
-    }
-
-    EXPECT_TRUE(
-        file_util::PathExists(FilePath::FromWStringHack(chrome_exe_test_path)));
-
-    return chrome_exe_path;
-  }
-
   void InitiateNextNavigation() {
     // Get the memory consumption information for the child processes
     // of the chrome browser.