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

chrome_frame/test/chrome_frame_automation_mock.h

 // 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.
 
 #ifndef CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_
 #define CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/path_service.h"
+#include "base/test/test_process_killer_win.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome_frame/chrome_frame_automation.h"
 #include "chrome_frame/chrome_frame_plugin.h"
 #include "chrome_frame/navigation_constraints.h"
-#include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/test_scrubber.h"
 #include "chrome_frame/test/test_with_web_server.h"
 #include "chrome_frame/utils.h"
 
 template <typename T>
 class AutomationMockDelegate
     : public CWindowImpl<T>,
       public ChromeFramePlugin<T> {
  public:
   AutomationMockDelegate(MessageLoop* caller_message_loop,
       int launch_timeout, bool perform_version_check,
       const std::wstring& profile_name,
       const std::wstring& language,
       bool incognito, bool is_widget_mode)
       : caller_message_loop_(caller_message_loop), is_connected_(false),
         navigation_result_(false),
         mock_server_(1337, L"127.0.0.1",
             chrome_frame_test::GetTestDataFolder()) {
 
     // Endeavour to only kill off Chrome Frame derived Chrome processes.
-    KillAllNamedProcessesWithArgument(
+    base::KillAllNamedProcessesWithArgument(
         UTF8ToWide(chrome_frame_test::kChromeImageName),
         UTF8ToWide(switches::kChromeFrame));
 
     mock_server_.ExpectAndServeAnyRequests(CFInvocation(CFInvocation::NONE));
 
     base::FilePath profile_path;
     GetChromeFrameProfilePath(profile_name, &profile_path);
     chrome_frame_test::OverrideDataDirectoryForThisTest(profile_path.value());
 
     automation_client_ = new ChromeFrameAutomationClient;
@@ skipping 182 matching lines @@
     QuitMessageLoop();
   }
   virtual void OnLoad(const GURL& url) {
     Base::OnLoad(url);
   }
  private:
   bool request_start_result_;
 };
 
 #endif  // CHROME_FRAME_TEST_CHROME_FRAME_AUTOMATION_MOCK_H_