From 02bc8a0462d035f166d87ef4fac5adbb3d6aacce Mon Sep 17 00:00:00 2001
From: "ananta@chromium.org"
<ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 28 Jun 2010 22:53:32 +0000
Subject: [PATCH] ChromeFrame perf tests now depend on Chrome's reference
build. The ChromeFrame reference build under
trunk/deps/reference_builds/chrome_frame will be deleted in a separate CL.
This fixes a crash while running chrome frame perf tests on the perf builder.
Review URL: http://codereview.chromium.org/2859031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51060 0039d316-1c4b-4281-b951-d872f2087c98
---
DEPS | 2 +-
chrome_frame/test_utils.cc | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/DEPS b/DEPS
index 80ff669c1fde5..d13e96cd44283 100644
--- a/DEPS
+++ b/DEPS
@@ -187,7 +187,7 @@ deps_os = {
"src/third_party/xulrunner-sdk":
"/trunk/deps/third_party/xulrunner-sdk@17887",
"src/chrome_frame/tools/test/reference_build/chrome":
- "/trunk/deps/reference_builds/chrome_frame@33840",
+ "/trunk/deps/reference_builds/chrome@41984",
# Parses Windows PE/COFF executable format.
"src/third_party/pefile":
diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc
index 18f5f44d1dc80..95c35afe579e3 100644
--- a/chrome_frame/test_utils.cc
+++ b/chrome_frame/test_utils.cc
@@ -21,7 +21,6 @@
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() {
@@ -112,8 +111,7 @@ FilePath ScopedChromeFrameRegistrar::GetReferenceChromeFrameDllPath() {
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;
}
--
GitLab