ChromeFrame perf tests now depend on Chrome's reference build. The ChromeFram...

chrome_frame/test_utils.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome_frame/test_utils.h"
 
 #include <atlbase.h>
 #include <atlwin.h>
 #include <winternl.h>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/scoped_handle.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 const wchar_t kChromeFrameDllName[] = L"npchrome_frame.dll";
 const wchar_t kChromeLauncherExeName[] = L"chrome_launcher.exe";
-const char kReferenceChromeFrameDllName[] = "npchrome_tab.dll";
 
 // Statics
 FilePath ScopedChromeFrameRegistrar::GetChromeFrameBuildPath() {
   FilePath build_path;
   PathService::Get(chrome::DIR_APP, &build_path);
 
   FilePath dll_path = build_path.Append(L"servers").
                                  Append(kChromeFrameDllName);
 
   if (!file_util::PathExists(dll_path)) {
@@ skipping 70 matching lines @@
 
   reference_build_dir = reference_build_dir.DirName();
   reference_build_dir = reference_build_dir.DirName();
 
   reference_build_dir = reference_build_dir.AppendASCII("chrome_frame");
   reference_build_dir = reference_build_dir.AppendASCII("tools");
   reference_build_dir = reference_build_dir.AppendASCII("test");
   reference_build_dir = reference_build_dir.AppendASCII("reference_build");
   reference_build_dir = reference_build_dir.AppendASCII("chrome");
   reference_build_dir = reference_build_dir.AppendASCII("servers");
-  reference_build_dir = reference_build_dir.AppendASCII(
-      kReferenceChromeFrameDllName);
+  reference_build_dir = reference_build_dir.Append(kChromeFrameDllName);
   return reference_build_dir;
 }
 
 // Non-statics
 
 ScopedChromeFrameRegistrar::ScopedChromeFrameRegistrar(
     const std::wstring& path) {
   original_dll_path_ = path;
   RegisterChromeFrameAtPath(original_dll_path_);
 }
@@ skipping 172 matching lines @@
   base::NamedProcessIterator iter(process_name, &filter);
   while (const base::ProcessEntry* entry = iter.NextProcessEntry()) {
     if (!base::KillProcessById(entry->pid(), 0, true)) {
       DLOG(ERROR) << "Failed to kill process " << (*entry).th32ProcessID;
       result = false;
     }
   }
 
   return result;
 }