Some Chrome Frame cleanup:...

chrome_frame/test_utils.cc

 // Copyright (c) 2009 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 "chrome_frame/test_utils.h"
 
 #include <atlbase.h>
 #include <atlwin.h>
 #include <winternl.h>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/scoped_handle.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+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;
 }
 
 void ScopedChromeFrameRegistrar::RegisterDefaults() {
   FilePath dll_path = GetChromeFrameBuildPath();
   RegisterAtPath(dll_path.value());
 }
 
 void ScopedChromeFrameRegistrar::RegisterAtPath(
@@ skipping 46 matching lines @@
 
   file_util::UpOneDirectory(&reference_build_dir);
   file_util::UpOneDirectory(&reference_build_dir);
 
   file_util::AppendToPath(&reference_build_dir, L"chrome");
   file_util::AppendToPath(&reference_build_dir, L"tools");
   file_util::AppendToPath(&reference_build_dir, L"test");
   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);
 }
 
 std::wstring ScopedChromeFrameRegistrar::GetChromeFrameDllPath() const {
   return new_chrome_frame_dll_path_;
 }
 
 // TODO(robertshield): The following could be factored out into its own file.
 namespace {
@@ skipping 145 matching lines @@
   base::NamedProcessIterator iter(process_name, &filter);
   while (entry = iter.NextProcessEntry()) {
     if (!base::KillProcessById((*entry).th32ProcessID, 0, true)) {
       DLOG(ERROR) << "Failed to kill process " << (*entry).th32ProcessID;
       result = false;
     }
   }
 
   return result;
 }