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

chrome/test/ui/ui_test.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 <set>
 #include <vector>
 
 #include "chrome/test/ui/ui_test.h"
 
 #include "base/base_switches.h"
@@ skipping 221 matching lines @@
     ASSERT_TRUE(DieFileDie(user_data_dir_, true));
 
   if (!template_user_data_.empty()) {
     // Recursively copy the template directory to the user_data_dir.
     ASSERT_TRUE(file_util::CopyRecursiveDirNoCache(template_user_data_,
                                                    user_data_dir_));
   }
 
   browser_launch_time_ = TimeTicks::Now();
 
-  bool started = process_util::LaunchApp(
-                     command_line,
-                     false,  // Don't wait for process object (doesn't work for
-                             // us)
-                     !show_window_,
-                     &process_);
+  bool started = base::LaunchApp(command_line,
+                                 false,  // Don't wait for process object
+                                         // (doesn't work for us)
+                                 !show_window_,
+                                 &process_);
   ASSERT_EQ(started, true);
 
   if (use_existing_browser_) {
     DWORD pid = 0;
     HWND hwnd = FindWindowEx(HWND_MESSAGE, NULL, chrome::kMessageWindowClass,
                          user_data_dir_.c_str());
     GetWindowThreadProcessId(hwnd, &pid);
     // This mode doesn't work if we wound up launching a new browser ourselves.
-    ASSERT_NE(pid, process_util::GetProcId(process_));
+    ASSERT_NE(pid, base::GetProcId(process_));
     CloseHandle(process_);
     process_ = OpenProcess(SYNCHRONIZE, false, pid);
   }
 }
 
 void UITest::QuitBrowser() {
   typedef std::vector<BrowserProxy*> BrowserVector;
 
   // There's nothing to do here if the browser is not running.
   if (IsBrowserRunning()) {
@@ skipping 43 matching lines @@
 void UITest::AssertAppNotRunning(const std::wstring& error_message) {
   ASSERT_EQ(0, GetBrowserProcessCount()) << error_message;
 }
 
 void UITest::CleanupAppProcesses() {
   BrowserProcessFilter filter(L"");
 
   // Make sure that no instances of the browser remain.
   const int kExitTimeoutMs = 5000;
   const int kExitCode = 1;
-  process_util::CleanupProcesses(
-    chrome::kBrowserProcessExecutableName, kExitTimeoutMs, kExitCode,
-    &filter);
+  base::CleanupProcesses(
+      chrome::kBrowserProcessExecutableName, kExitTimeoutMs, kExitCode,
+      &filter);
 
   // Suppress spammy failures that seem to be occurring when running
   // the UI tests in single-process mode.
   // TODO(jhughes): figure out why this is necessary at all, and fix it
   if (!in_process_renderer_) {
     AssertAppNotRunning(L"Unable to quit all browser processes.");
   }
 }
 
 TabProxy* UITest::GetActiveTab() {
@@ skipping 102 matching lines @@
   return CrashAwareSleep(0);
 }
 
 bool UITest::CrashAwareSleep(int time_out_ms) {
   return WAIT_TIMEOUT == WaitForSingleObject(process_, time_out_ms);
 }
 
 /*static*/
 int UITest::GetBrowserProcessCount() {
   BrowserProcessFilter filter(L"");
-  return process_util::GetProcessCount(chrome::kBrowserProcessExecutableName,
-                                       &filter);
+  return base::GetProcessCount(chrome::kBrowserProcessExecutableName,
+                               &filter);
 }
 
 static DictionaryValue* LoadDictionaryValueFromPath(const std::wstring& path) {
   if (path.empty())
     return NULL;
 
   JSONFileValueSerializer serializer(path);
   Value* root_value = NULL;
   if (serializer.Deserialize(&root_value) &&
       root_value->GetType() != Value::TYPE_DICTIONARY) {
@@ skipping 206 matching lines @@
                               const std::wstring& units,
                               bool important) {
   // <*>RESULT <graph_name>: <trace_name>= <value> <units>
   // <*>RESULT <graph_name>: <trace_name>= {<mean>, <std deviation>} <units>
   // <*>RESULT <graph_name>: <trace_name>= [<value>,value,value,...,] <units>
   wprintf(L"%lsRESULT %ls%ls: %ls= %ls%ls%ls %ls\n",
           important ? L"*" : L"", measurement.c_str(), modifier.c_str(),
           trace.c_str(), prefix.c_str(), values.c_str(), suffix.c_str(),
           units.c_str());
 }