diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-01 02:25:11 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-01 02:25:11 +0000 |
| commit | 87ba2e6056bfe771ddc6ce540cf3d4e413d4e6f4 (patch) | |
| tree | fabaa7bfcd986c6ea6481d571e7ccad4afc74ced /chrome_frame/test_utils.h | |
| parent | 35c96084eb0abf809bb86c9c95c74ac4e6284fe5 (diff) | |
| download | chromium_src-87ba2e6056bfe771ddc6ce540cf3d4e413d4e6f4.zip chromium_src-87ba2e6056bfe771ddc6ce540cf3d4e413d4e6f4.tar.gz chromium_src-87ba2e6056bfe771ddc6ce540cf3d4e413d4e6f4.tar.bz2 | |
Add an integration test for Chrome Frame's DllRedirector class.
Fix a bug in the DllRedirector module loading code.
Expand the alternate version generator code to provide a function for generating new versions of single modules.
Remove the LI SACL from the shared memory lock for Win XP.
BUG=NONE
TEST=NONE
Review URL: http://codereview.chromium.org/6600001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76338 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test_utils.h')
| -rw-r--r-- | chrome_frame/test_utils.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome_frame/test_utils.h b/chrome_frame/test_utils.h index f3947c0..7b66083 100644 --- a/chrome_frame/test_utils.h +++ b/chrome_frame/test_utils.h @@ -41,7 +41,6 @@ class ScopedChromeFrameRegistrar { std::wstring GetChromeFrameDllPath() const; - static FilePath GetChromeFrameBuildPath(); static void RegisterAtPath(const std::wstring& path, RegistrationType registration_type); static void UnregisterAtPath(const std::wstring& path, @@ -60,6 +59,11 @@ class ScopedChromeFrameRegistrar { RegistrationType registration_type_; }; +// Returns the path to the Chrome Frame DLL in the build directory. Assumes +// that the test executable is running from the build folder or a similar +// folder structure. +FilePath GetChromeFrameBuildPath(); + // Callback description for onload, onloaderror, onmessage static _ATL_FUNC_INFO g_single_param = {CC_STDCALL, VT_EMPTY, 1, {VT_VARIANT}}; // Simple class that forwards the callbacks. |