Make Ash unittests clean up zombie viewer processes between test runs. These zombie viewer proce…

chrome_frame/test/test_scrubber.cc

 // Copyright (c) 2012 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.
 
 // The test scrubber uses a Google Test event listener to trigger scrubs.
 // Scrubs are performed at the start of the test program and at the conclusion
 // of each test.
 
 #include "chrome_frame/test/test_scrubber.h"
 
 #include <windows.h>
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/process_util.h"
 #include "base/string16.h"
+#include "base/test/test_process_killer_win.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "content/public/common/content_switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chrome_frame_test {
 
@@ skipping 65 matching lines @@
 
 void TestScrubber::CleanUpFromTestRun() {
   // Kill all iexplore.exe and ieuser.exe processes.
   base::KillProcesses(chrome_frame_test::kIEImageName, 0, NULL);
   base::KillProcesses(chrome_frame_test::kIEBrokerImageName, 0, NULL);
 
   // Kill all chrome_launcher processes trying to launch Chrome.
   base::KillProcesses(chrome_frame_test::kChromeLauncher, 0, NULL);
 
   // Kill all chrome.exe processes with --chrome-frame.
-  KillAllNamedProcessesWithArgument(
+  base::KillAllNamedProcessesWithArgument(
       chrome::kBrowserProcessExecutableName,
       ASCIIToWide(switches::kChromeFrame));
 
   // Delete the user data directory.
   base::FilePath data_directory(data_directory_override_.empty() ?
                           default_data_directory_ :
                           data_directory_override_);
 
   VLOG_IF(1, file_util::PathExists(data_directory))
       << __FUNCTION__ << " deleting user data directory "
@@ skipping 21 matching lines @@
 
 void OverrideDataDirectoryForThisTest(
     const base::StringPiece16& user_data_dir) {
   // Must be called within the context of a test.
   DCHECK(testing::UnitTest::GetInstance()->current_test_info());
 
   g_scrubber.Get().set_data_directory_override(user_data_dir);
 }
 
 }  // namespace chrome_frame_test