Add Terminate() to the Process object, have RenderProcessHost use this to avoid some more Windows specific code.

Move Process and SharedMemory into the base namespace (most changes).

Review URL: http://codereview.chromium.org/10895

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5446 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 6 insertions, 6 deletions

diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index fe62e67..4bf5856 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -52,8 +52,8 @@ void CloseAllChromeProcesses() {
       window = FindWindowEx(NULL, window, wnd_class.c_str(), NULL);
       if (!SendMessageTimeout(tmpWnd, WM_CLOSE, 0, 0, SMTO_BLOCK, 3000, NULL) &&
           (GetLastError() == ERROR_TIMEOUT)) {
-        process_util::CleanupProcesses(installer_util::kChromeExe, 0,
-                                       ResultCodes::HUNG, NULL);
+        base::CleanupProcesses(installer_util::kChromeExe, 0,
+                               ResultCodes::HUNG, NULL);
         return;
       }
     }
@@ -61,8 +61,8 @@ void CloseAllChromeProcesses() {
 
   // If asking politely didn't work, wait for 15 seconds and then kill all
   // chrome.exe. This check is just in case Chrome is ignoring WM_CLOSE messages.
-  process_util::CleanupProcesses(installer_util::kChromeExe, 15000,
-                                 ResultCodes::HUNG, NULL);
+  base::CleanupProcesses(installer_util::kChromeExe, 15000,
+                         ResultCodes::HUNG, NULL);
 }
 
 // This method deletes Chrome shortcut folder from Windows Start menu. It
diff --git a/chrome/installer/util/helper.cc b/chrome/installer/util/helper.cc
index 3d86c8d..b7dd3c6 100644
--- a/chrome/installer/util/helper.cc
+++ b/chrome/installer/util/helper.cc
@@ -39,7 +39,7 @@ bool installer::LaunchChrome(bool system_install) {
   chrome_exe.append(installer::GetChromeInstallPath(system_install));
   file_util::AppendToPath(&chrome_exe, installer_util::kChromeExe);
   chrome_exe.append(L"\"");
-  return process_util::LaunchApp(chrome_exe, false, false, NULL);
+  return base::LaunchApp(chrome_exe, false, false, NULL);
 }
 
 bool installer::LaunchChromeAndWaitForResult(bool system_install,
diff --git a/chrome/installer/util/run_all_unittests.cc b/chrome/installer/util/run_all_unittests.cc
index 4ab019a..e7c7b37 100644
--- a/chrome/installer/util/run_all_unittests.cc
+++ b/chrome/installer/util/run_all_unittests.cc
@@ -6,6 +6,6 @@
 #include "base/test_suite.h"
 
 int main(int argc, char** argv) {
-  process_util::EnableTerminationOnHeapCorruption();
+  base::EnableTerminationOnHeapCorruption();
   return TestSuite(argc, argv).Run();
 }