Some Chrome Frame cleanup:...

chrome_frame/test/chrome_frame_unittests.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #include <windows.h>
 #include <stdarg.h>
 
 // IShellWindows includes.  Unfortunately we can't keep these in
 // alphabetic order since exdisp will bark if some interfaces aren't fully
 // defined.
 #include <mshtml.h>
@@ skipping 177 matching lines @@
   } else {
     ASSERT_TRUE(WaitForTestToComplete(kLongWaitTimeout));
     ASSERT_TRUE(CheckResultFile(result_file_to_check, "OK"));
   }
 }
 
 void ChromeFrameTestWithWebServer::VersionTest(BrowserKind browser,
     const wchar_t* page, const wchar_t* result_file_to_check) {
   std::wstring plugin_path;
   PathService::Get(base::DIR_MODULE, &plugin_path);
-  file_util::AppendToPath(&plugin_path, L"servers/npchrome_tab.dll");
+  file_util::AppendToPath(&plugin_path, L"servers");
+  file_util::AppendToPath(&plugin_path, kChromeFrameDllName);
 
   static FileVersionInfo* version_info =
       FileVersionInfo::CreateFileVersionInfo(plugin_path);
 
   std::wstring version;
   if (version_info)
     version = version_info->product_version();
 
-  // If we can't find the npchrome_tab.dll in the src tree, we turn to
+  // If we can't find the Chrome Frame DLL in the src tree, we turn to
   // the directory where chrome is installed.
   if (!version_info) {
     installer::Version* ver_system = InstallUtil::GetChromeVersion(true);
     installer::Version* ver_user = InstallUtil::GetChromeVersion(false);
     ASSERT_TRUE(ver_system || ver_user);
 
     bool system_install = ver_system ? true : false;
-    std::wstring npchrome_path(installer::GetChromeInstallPath(system_install));
-    file_util::AppendToPath(&npchrome_path,
+    std::wstring cf_dll_path(installer::GetChromeInstallPath(system_install));
+    file_util::AppendToPath(&cf_dll_path,
         ver_system ? ver_system->GetString() : ver_user->GetString());
-    file_util::AppendToPath(&npchrome_path, L"npchrome_tab.dll");
-    version_info = FileVersionInfo::CreateFileVersionInfo(npchrome_path);
+    file_util::AppendToPath(&cf_dll_path, kChromeFrameDllName);
+    version_info = FileVersionInfo::CreateFileVersionInfo(cf_dll_path);
     if (version_info)
       version = version_info->product_version();
   }
 
   EXPECT_TRUE(version_info);
   EXPECT_FALSE(version.empty());
   EXPECT_TRUE(LaunchBrowser(browser, page));
   ASSERT_TRUE(WaitForTestToComplete(kLongWaitTimeout));
   ASSERT_TRUE(CheckResultFile(result_file_to_check, WideToUTF8(version)));
 }
@@ skipping 1515 matching lines @@
   ASSERT_TRUE(
       LaunchBrowser(IE,
                     kChromeFrameFullTabModeXMLHttpRequestAuthHeaderTestUrl));
 
   loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
 
   chrome_frame_test::CloseAllIEWindows();
   ASSERT_TRUE(
       CheckResultFile(L"FullTab_XMLHttpRequestAuthorizationHeaderTest", "OK"));
 }