Add Terminate() to the Process object, have RenderProcessHost use this to avo...

chrome/test/mini_installer_test/chrome_mini_installer.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 "chrome/test/mini_installer_test/chrome_mini_installer.h"
 
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/registry.h"
 #include "base/string_util.h"
@@ skipping 95 matching lines @@
     return;
   }
 
   printf("\nClosing Chrome processes, if any...\n");
   CloseProcesses(installer_util::kChromeExe);
 
   std::wstring uninstall_path = GetUninstallPath();
   ASSERT_TRUE(file_util::PathExists(uninstall_path));
 
   printf("\nUninstalling Chrome...\n");
-  process_util::LaunchApp(L"\"" + uninstall_path + L"\"" + L" -uninstall",
-                          false, false, NULL);
+  base::LaunchApp(L"\"" + uninstall_path + L"\"" + L" -uninstall",
+                  false, false, NULL);
   printf("\nLaunched setup.exe -uninstall....\n");
   ASSERT_TRUE(CloseWindow(mini_installer_constants::kChromeBuildType,
                           WM_COMMAND));
   WaitUntilProcessStopsRunning(
       mini_installer_constants::kChromeSetupExecutable);
   ASSERT_FALSE(CheckRegistryKey(dist->GetVersionKey()));
   DeleteAppFolder();
   FindChromeShortcut();
   CloseProcesses(mini_installer_constants::kIEExecutable);
-  ASSERT_EQ(0, process_util::GetProcessCount(
-                             mini_installer_constants::kIEExecutable, NULL));
+  ASSERT_EQ(0,
+      base::GetProcessCount(mini_installer_constants::kIEExecutable, NULL));
 }
 
 // Takes care of Chrome uninstall dialog.
 bool ChromeMiniInstaller::CloseWindow(LPCWSTR window_name, UINT message) {
   int timer = 0;
   bool return_val = false;
   HWND hndl = FindWindow(NULL, window_name);
   while (hndl== NULL && (timer < 60000)) {
     hndl = FindWindow(NULL, window_name);
     Sleep(200);
     timer = timer + 200;
   }
   if (hndl != NULL) {
     LRESULT _result = SendMessage(hndl, message, 1, 0);
     return_val = true;
   }
   return return_val;
 }
 
 // Closes Chrome browser.
 void ChromeMiniInstaller::CloseChromeBrowser(LPCWSTR window_name) {
   WaitUntilProcessStartsRunning(installer_util::kChromeExe);
   ASSERT_TRUE(CloseWindow(window_name, WM_CLOSE));
 }
 
 // Checks for all requested running processes and kills them.
 void ChromeMiniInstaller::CloseProcesses(const std::wstring& executable_name) {
   int timer = 0;
-  while ((process_util::GetProcessCount(executable_name, NULL) > 0) &&
+  while ((base::GetProcessCount(executable_name, NULL) > 0) &&
          (timer < 20000)) {
     process_util::KillProcesses(executable_name, 1, NULL);
     Sleep(200);
     timer = timer + 200;
   }
   ASSERT_EQ(0, process_util::GetProcessCount(executable_name, NULL));
 }
 
 // Checks for Chrome registry keys.
 bool ChromeMiniInstaller::CheckRegistryKey(std::wstring key_path) {
@@ skipping 143 matching lines @@
   int timer = 0;
   printf("\nWaiting for this process to end... %ls\n", process_name);
   while ((process_util::GetProcessCount(process_name, NULL) > 0) &&
          (timer < 60000)) {
     Sleep(200);
     timer = timer + 200;
   }
   ASSERT_EQ(0, process_util::GetProcessCount(process_name, NULL));
 }