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

chrome/browser/memory_details.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/memory_details.h"
 #include <psapi.h>
 
 #include "base/file_version_info.h"
 #include "base/histogram.h"
 #include "base/image_util.h"
@@ skipping 61 matching lines @@
 
   // Collect the list of plugins.
   for (PluginProcessHostIterator plugin_iter;
        !plugin_iter.Done(); ++plugin_iter) {
     PluginProcessHost* plugin = const_cast<PluginProcessHost*>(*plugin_iter);
     DCHECK(plugin);
     if (!plugin || !plugin->process())
       continue;
 
     PluginProcessInformation info;
-    info.pid = process_util::GetProcId(plugin->process());
+    info.pid = base::GetProcId(plugin->process());
     if (info.pid != 0) {
       info.dll_path = plugin->dll_path();
       plugins_.push_back(info);
     }
   }
 
   // Now go do expensive memory lookups from the file thread.
   ChromeThread::GetMessageLoop(ChromeThread::FILE)->PostTask(FROM_HERE,
       NewRunnableMethod(this, &MemoryDetails::CollectProcessData));
 }
@@ skipping 29 matching lines @@
     HANDLE handle = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ,
                                 FALSE, process_list[index]);
     if (handle) {
       TCHAR name[MAX_PATH];
       if (GetModuleBaseName(handle, NULL, name, MAX_PATH-1)) {
         for (int index2 = 0; index2 < arraysize(g_process_template); index2++) {
           if (_wcsicmp(process_data_[index2].process_name, name) == 0) {
             // Get Memory Information.
             ProcessMemoryInformation info;
             info.pid = process_list[index];
-            scoped_ptr<process_util::ProcessMetrics> metrics;
-            metrics.reset(
-              process_util::ProcessMetrics::CreateProcessMetrics(handle));
+            scoped_ptr<base::ProcessMetrics> metrics;
+            metrics.reset(base::ProcessMetrics::CreateProcessMetrics(handle));
             metrics->GetCommittedKBytes(&info.committed);
             metrics->GetWorkingSetKBytes(&info.working_set);
 
             // Get Version Information.
             if (index2 == 0) {  // Chrome
               scoped_ptr<FileVersionInfo> version_info(
                  FileVersionInfo::CreateFileVersionInfoForCurrentModule());
               if (version_info != NULL)
                 info.version = version_info->file_version();
             } else if (GetModuleFileNameEx(handle, NULL, name, MAX_PATH-1)) {
@@ skipping 128 matching lines @@
   if (trial.get()) {
     if (trial->boolean_value())
       UMA_HISTOGRAM_MEMORY_MB(L"Memory.Total_trial_high_memory", total_sample);
     else
       UMA_HISTOGRAM_MEMORY_MB(L"Memory.Total_trial_med_memory", total_sample);
   } else {
     UMA_HISTOGRAM_MEMORY_MB(L"Memory.Total", total_sample);
   }
 }