summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test_utils.cc
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-05 19:16:23 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-05 19:16:23 +0000
commitea9ed97d074fa3ae84486f952eb66ea1e95ce37e (patch)
treed4603d01863ded8450e4d3109bf56d406e2c1d1a /chrome_frame/test_utils.cc
parent880b6f26f7cda4ddefbf2c269a2ec86dce71c2ff (diff)
downloadchromium_src-ea9ed97d074fa3ae84486f952eb66ea1e95ce37e.zip
chromium_src-ea9ed97d074fa3ae84486f952eb66ea1e95ce37e.tar.gz
chromium_src-ea9ed97d074fa3ae84486f952eb66ea1e95ce37e.tar.bz2
Some Chrome Frame cleanup:
1) Rearrange the chrome_frame.gyp file to: a) Split out most of CF into a static lib to make writing unit tests easier (not having to re-include source files). b) Remove most of the un-needed xulrunner-sdk includes. 2) Move all OBJECT_ENTRY_AUTO macros to chrome_tab.cc since they don't work without extra work when residing in a lib. 3) Rename npchrome_tab.dll to npchrome_frame.dll. BUG=none TEST=none Review URL: http://codereview.chromium.org/523040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35543 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test_utils.cc')
-rw-r--r--chrome_frame/test_utils.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc
index bbe6c86..cf6b219 100644
--- a/chrome_frame/test_utils.cc
+++ b/chrome_frame/test_utils.cc
@@ -19,13 +19,14 @@
#include "chrome/common/chrome_switches.h"
#include "testing/gtest/include/gtest/gtest.h"
-// Statics
+const wchar_t kChromeFrameDllName[] = L"npchrome_frame.dll";
+// Statics
FilePath ScopedChromeFrameRegistrar::GetChromeFrameBuildPath() {
FilePath build_path;
PathService::Get(chrome::DIR_APP, &build_path);
build_path = build_path.Append(L"servers").
- Append(L"npchrome_tab.dll");
+ Append(kChromeFrameDllName);
file_util::PathExists(build_path);
return build_path;
}
@@ -92,7 +93,7 @@ void ScopedChromeFrameRegistrar::RegisterReferenceChromeFrameBuild() {
file_util::AppendToPath(&reference_build_dir, L"reference_build");
file_util::AppendToPath(&reference_build_dir, L"chrome_frame");
file_util::AppendToPath(&reference_build_dir, L"servers");
- file_util::AppendToPath(&reference_build_dir, L"npchrome_tab.dll");
+ file_util::AppendToPath(&reference_build_dir, kChromeFrameDllName);
RegisterChromeFrameAtPath(reference_build_dir);
}