More refactoring of PluginProcessHost

chrome/browser/browser.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.h"
 
 #include "base/command_line.h"
 #include "base/idle_timer.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/browser/tab_contents/tab_contents_type.h"
 #include "chrome/browser/tab_contents/web_contents.h"
+#include "chrome/common/child_process_info.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/page_transition_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #ifdef CHROME_PERSONALIZATION
 #include "chrome/personalization/personalization.h"
 #endif
@@ skipping 16 matching lines @@
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/debugger/debugger_window.h"
 #include "chrome/browser/dock_info.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/browser/history_tab_ui.h"
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/net/url_fixer_upper.h"
-#include "chrome/browser/plugin_process_host.h"
-#include "chrome/browser/plugin_service.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
 #include "chrome/browser/status_bubble.h"
 #include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/tab_contents/web_contents_view.h"
 #include "chrome/browser/task_manager.h"
 #include "chrome/browser/user_data_manager.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/download_tab_view.h"
 #include "chrome/browser/views/location_bar_view.h"
 #include "chrome/browser/window_sizer.h"
@@ skipping 11 matching lines @@
 
 // Idle time before helping prune memory consumption.
 static const int kBrowserReleaseMemoryInterval = 30;  // In seconds.
 
 // How much horizontal and vertical offset there is between newly opened
 // windows.
 static const int kWindowTilePixels = 20;
 
 ///////////////////////////////////////////////////////////////////////////////
 
-// A task to reduce the working set of the plugins.
-class ReducePluginsWorkingSetTask : public Task {
+// A task to reduce the working set of the child processes that live on the IO
+// thread (i.e. plugins, workers).
+class ReduceChildProcessesWorkingSetTask : public Task {
  public:
   virtual void Run() {
 #if defined(OS_WIN)
-    for (PluginProcessHostIterator iter; !iter.Done(); ++iter) {
-      ChildProcessInfo* child = const_cast<PluginProcessHost*>(*iter);
-      DCHECK(child->process().handle());
-      child->process().ReduceWorkingSet();
+    for (ChildProcessInfo::Iterator iter; !iter.Done(); ++iter) {
+      DCHECK(iter->process().handle());
+      iter->process().ReduceWorkingSet();
     }
 #endif
   }
 };
 
 // A browser task to run when the user is not using the browser.
 // In our case, we're trying to be nice to the operating system and release
 // memory not in use.
 class BrowserIdleTimer : public base::IdleTimer {
  public:
@@ skipping 11 matching lines @@
     process.ReduceWorkingSet();
 
     // Handle the Renderer(s).
     RenderProcessHost::iterator renderer_iter;
     for (renderer_iter = RenderProcessHost::begin(); renderer_iter !=
          RenderProcessHost::end(); renderer_iter++) {
        base::Process process = renderer_iter->second->process();
        process.ReduceWorkingSet();
     }
 
-    // Handle the Plugin(s).  We need to iterate through the plugin processes
-    // on the IO thread because that thread manages the plugin process
-    // collection.
+    // Handle the child processe.  We need to iterate through them on the IO
+    // thread because that thread manages the child process collection.
     g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
-        new ReducePluginsWorkingSetTask());
+        new ReduceChildProcessesWorkingSetTask());
 #endif
   }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 struct Browser::UIUpdate {
   UIUpdate(const TabContents* src, unsigned flags)
       : source(src),
         changed_flags(flags) {
@@ skipping 2272 matching lines @@
 
   // We need to register the window position pref.
   std::wstring window_pref(prefs::kBrowserWindowPlacement);
   window_pref.append(L"_");
   window_pref.append(app_name);
   PrefService* prefs = g_browser_process->local_state();
   DCHECK(prefs);
 
   prefs->RegisterDictionaryPref(window_pref.c_str());
 }