summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test_utils.h
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.h
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.h')
-rw-r--r--chrome_frame/test_utils.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome_frame/test_utils.h b/chrome_frame/test_utils.h
index 9dc3a7e..0d18379 100644
--- a/chrome_frame/test_utils.h
+++ b/chrome_frame/test_utils.h
@@ -12,6 +12,8 @@
#include "base/file_path.h"
+extern const wchar_t kChromeFrameDllName[];
+
// Helper class used to register different chrome frame DLLs while running
// tests. At construction, this registers the DLL found in the build path.
// At destruction, again registers the DLL found in the build path if another
@@ -34,10 +36,10 @@ class ScopedChromeFrameRegistrar {
static void RegisterDefaults();
private:
- // Contains the path of the most recently registered npchrome_tab.dll.
+ // Contains the path of the most recently registered Chrome Frame DLL.
std::wstring new_chrome_frame_dll_path_;
- // Contains the path of the npchrome_tab.dll to be registered at destruction.
+ // Contains the path of the Chrome Frame DLL to be registered at destruction.
std::wstring original_dll_path_;
};