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

chrome/test/mini_installer_test/chrome_mini_installer.cc

Index: chrome/test/mini_installer_test/chrome_mini_installer.cc
===================================================================
--- chrome/test/mini_installer_test/chrome_mini_installer.cc	(revision 5371)
+++ chrome/test/mini_installer_test/chrome_mini_installer.cc	(working copy)
@@ -113,8 +113,8 @@
   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));
@@ -124,8 +124,8 @@
   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.
@@ -154,7 +154,7 @@
 // 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);