More refactoring of PluginProcessHost

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"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/scoped_ptr.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
-#include "chrome/browser/plugin_process_host.h"
-#include "chrome/browser/plugin_service.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/web_contents.h"
+#include "chrome/common/child_process_info.h"
 
 class RenderViewHostDelegate;
 
 // Template of static data we use for finding browser process information.
 // These entries must match the ordering for MemoryDetails::BrowserProcess.
 static ProcessData g_process_template[] = {
     { L"Chromium", L"chrome.exe", },
     { L"IE", L"iexplore.exe", },
     { L"Firefox", L"firefox.exe", },
     { L"Opera", L"opera.exe", },
     { L"Safari", L"safari.exe", },
   };
 
 
 // About threading:
 //
 // This operation will hit no fewer than 3 threads.
 //
-// The PluginHostIterator can only be accessed from the IO thread.
+// The ChildProcessInfo::Iterator can only be accessed from the IO thread.
 //
 // The RenderProcessHostIterator can only be accessed from the UI thread.
 //
 // This operation can take 30-100ms to complete.  We never want to have
 // one task run for that long on the UI or IO threads.  So, we run the
 // expensive parts of this operation over on the file thread.
 //
 
 MemoryDetails::MemoryDetails()
   : ui_loop_(NULL) {
@@ skipping 14 matching lines @@
   g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
       NewRunnableMethod(this, &MemoryDetails::CollectChildInfoOnIOThread));
 }
 
 void MemoryDetails::CollectChildInfoOnIOThread() {
   DCHECK(MessageLoop::current() ==
       ChromeThread::GetMessageLoop(ChromeThread::IO));
 
   std::vector<ProcessMemoryInformation> child_info;
 
-  // Collect the list of plugins.
-  for (PluginProcessHostIterator plugin_iter;
-       !plugin_iter.Done(); ++plugin_iter) {
-    ChildProcessInfo* child = const_cast<PluginProcessHost*>(*plugin_iter);
-    DCHECK(child);
-    if (!child || !child->process().handle())
+  // Collect the list of child processes.
+  for (ChildProcessInfo::Iterator iter; !iter.Done(); ++iter) {
+    if (!iter->process().handle())
       continue;
 
     ProcessMemoryInformation info;
-    info.pid = child->process().pid();
+    info.pid = iter->process().pid();
     if (!info.pid)
       continue;
 
-    info.type = child->type();
-    info.titles.push_back(child->name());
+    info.type = iter->type();
+    info.titles.push_back(iter->name());
     child_info.push_back(info);
   }
 
   // Now go do expensive memory lookups from the file thread.
   ChromeThread::GetMessageLoop(ChromeThread::FILE)->PostTask(FROM_HERE,
       NewRunnableMethod(this, &MemoryDetails::CollectProcessData, child_info));
 }
 
 void MemoryDetails::CollectProcessData(
     std::vector<ProcessMemoryInformation> child_info) {
@@ skipping 136 matching lines @@
     }
   }
 
   // Get rid of other Chrome processes that are from a different profile.
   for (size_t index = 0; index < process_data_[CHROME_BROWSER].processes.size();
       index++) {
     if (process_data_[CHROME_BROWSER].processes[index].type ==
         ChildProcessInfo::UNKNOWN_PROCESS) {
       process_data_[CHROME_BROWSER].processes.erase(
           process_data_[CHROME_BROWSER].processes.begin() + index);
-      index --;
+      index--;
     }
   }
 
   UpdateHistograms();
 
   OnDetailsAvailable();
 }
 
 void MemoryDetails::UpdateHistograms() {
   // Reports a set of memory metrics to UMA.
@@ skipping 25 matching lines @@
   }
 
   UMA_HISTOGRAM_COUNTS_100(L"Memory.ProcessCount",
       static_cast<int>(browser.processes.size()));
   UMA_HISTOGRAM_COUNTS_100(L"Memory.PluginProcessCount", plugin_count);
   UMA_HISTOGRAM_COUNTS_100(L"Memory.WorkerProcessCount", worker_count);
 
   int total_sample = static_cast<int>(aggregate_memory / 1000);
   UMA_HISTOGRAM_MEMORY_MB(L"Memory.Total", total_sample);
 }