Refactor plugin process code which checks with the browser process before shutdown, to avoid races in which the browser process thinks the process is fine to use while it's shutting down. I also removed PluginProcess/WorkerProcess since they didn't have any code in them now.

I removed the plugin process code which waits 10 seconds before shutting itself down.  That was a premature optimization, since testing with/without this didn't show any difference (see http://www/~jabdelmalek/chrome/test/plugins/processes.html).  In both cases, the plugin on a page would get recreated in less than 100ms, even with reusing or starting a plugin process from scratch.  We already spawn new renderer processes on back and forth if it's a different origin, and the plugin will be in the cache anyways.


Review URL: http://codereview.chromium.org/53091

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12703 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 26 deletions

diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc
index 26f791b..d46a1d5 100644
--- a/chrome/browser/plugin_service.cc
+++ b/chrome/browser/plugin_service.cc
@@ -27,8 +27,7 @@ PluginService* PluginService::GetInstance() {
 PluginService::PluginService()
     : main_message_loop_(MessageLoop::current()),
       resource_dispatcher_host_(NULL),
-      ui_locale_(g_browser_process->GetApplicationLocale()),
-      plugin_shutdown_handler_(new ShutdownHandler) {
+      ui_locale_(g_browser_process->GetApplicationLocale()) {
   // Have the NPAPI plugin list search for Chrome plugins as well.
   ChromePluginLib::RegisterPluginsWithNPAPI();
   // Load the one specified on the command line as well.
@@ -172,27 +171,3 @@ bool PluginService::HavePluginFor(const std::string& mime_type,
                                                        allow_wildcard, &info,
                                                        NULL);
 }
-
-void PluginService::Shutdown() {
-  plugin_shutdown_handler_->InitiateShutdown();
-}
-
-void PluginService::OnShutdown() {
-  for (ChildProcessHost::Iterator iter(ChildProcessInfo::PLUGIN_PROCESS);
-       !iter.Done(); ++iter) {
-    static_cast<PluginProcessHost*>(*iter)->Shutdown();
-  }
-}
-
-void PluginService::ShutdownHandler::InitiateShutdown() {
-  g_browser_process->io_thread()->message_loop()->PostTask(
-      FROM_HERE,
-      NewRunnableMethod(this, &ShutdownHandler::OnShutdown));
-}
-
-void PluginService::ShutdownHandler::OnShutdown() {
-  PluginService* plugin_service = PluginService::GetInstance();
-  if (plugin_service) {
-    plugin_service->OnShutdown();
-  }
-}