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

chrome/browser/browser_init.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/browser/browser_init.h"
 
 #include <shellapi.h>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 159 matching lines @@
     std::wstring text = l10n_util::GetString(IDS_BROWSER_HUNGBROWSER_MESSAGE);
     std::wstring caption = l10n_util::GetString(IDS_PRODUCT_NAME);
     if (IDYES != win_util::MessageBox(NULL, text, caption,
                                       MB_YESNO | MB_ICONSTOP | MB_TOPMOST)) {
       // The user denied. Quit silently.
       return true;
     }
   }
 
   // Time to take action. Kill the browser process.
-  process_util::KillProcess(process_id, ResultCodes::HUNG, true);
+  base::KillProcess(process_id, ResultCodes::HUNG, true);
   remote_window_ = NULL;
   return false;
 }
 
 void BrowserInit::MessageWindow::Create() {
   DCHECK(!window_);
   DCHECK(!remote_window_);
   HINSTANCE hinst = GetModuleHandle(NULL);
 
   WNDCLASSEX wc = {0};
@@ skipping 122 matching lines @@
 
 void BrowserInit::MessageWindow::HuntForZombieChromeProcesses() {
   // Detecting dead renderers is simple:
   // - The process is named chrome.exe.
   // - The process' parent doesn't exist anymore.
   // - The process doesn't have a chrome::kMessageWindowClass window.
   // If these conditions hold, the process is a zombie renderer or plugin.
 
   // Retrieve the list of browser processes on start. This list is then used to
   // detect zombie renderer process or plugin process.
-  class ZombieDetector : public process_util::ProcessFilter {
+  class ZombieDetector : public base::ProcessFilter {
    public:
     ZombieDetector() {
       for (HWND window = NULL;;) {
         window = FindWindowEx(HWND_MESSAGE,
                               window,
                               chrome::kMessageWindowClass,
                               NULL);
         if (!window)
           break;
         DWORD process = 0;
@@ skipping 21 matching lines @@
 
       // The chrome process is orphan.
       return true;
     }
 
    protected:
     std::vector<uint32> browsers_;
   };
 
   ZombieDetector zombie_detector;
-  process_util::KillProcesses(L"chrome.exe",
-                              ResultCodes::HUNG,
-                              &zombie_detector);
+  base::KillProcesses(L"chrome.exe", ResultCodes::HUNG, &zombie_detector);
 }
 
 
 // LaunchWithProfile ----------------------------------------------------------
 
 BrowserInit::LaunchWithProfile::LaunchWithProfile(const std::wstring& cur_dir,
                                                   const std::wstring& cmd_line,
                                                   int show_command)
     : command_line_(cmd_line),
       show_command_(show_command),
@@ skipping 342 matching lines @@
   if (!launched) {
     LOG(ERROR) << "launch error";
     if (return_code != NULL) {
       *return_code = ResultCodes::INVALID_CMDLINE_URL;
     }
     return false;
   }
 
   return true;
 }