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

1 files changed, 4 insertions, 2 deletions

diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc
index 924ea53..258b0fa 100644
--- a/chrome_frame/test_utils.cc
+++ b/chrome_frame/test_utils.cc
@@ -25,8 +25,7 @@
 const wchar_t kChromeFrameDllName[] = L"npchrome_frame.dll";
 const wchar_t kChromeLauncherExeName[] = L"chrome_launcher.exe";
 
-// Statics
-FilePath ScopedChromeFrameRegistrar::GetChromeFrameBuildPath() {
+FilePath GetChromeFrameBuildPath() {
   FilePath build_path;
   PathService::Get(chrome::DIR_APP, &build_path);
 
@@ -46,11 +45,13 @@ FilePath ScopedChromeFrameRegistrar::GetChromeFrameBuildPath() {
   return dll_path;
 }
 
+// static
 void ScopedChromeFrameRegistrar::RegisterDefaults() {
   FilePath dll_path = GetChromeFrameBuildPath();
   RegisterAtPath(dll_path.value(), chrome_frame_test::GetTestBedType());
 }
 
+// static
 void ScopedChromeFrameRegistrar::RegisterAtPath(
     const std::wstring& path, RegistrationType registration_type) {
 
@@ -88,6 +89,7 @@ void ScopedChromeFrameRegistrar::RegisterAtPath(
   ASSERT_TRUE(FreeLibrary(dll_handle));
 }
 
+// static
 void ScopedChromeFrameRegistrar::UnregisterAtPath(
     const std::wstring& path, RegistrationType registration_type) {