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, 0 insertions, 27 deletions

diff --git a/chrome/browser/plugin_service.h b/chrome/browser/plugin_service.h
index d4f9368..d193cda 100644
--- a/chrome/browser/plugin_service.h
+++ b/chrome/browser/plugin_service.h
@@ -101,10 +101,6 @@ class PluginService {
     return resource_dispatcher_host_;
   }
 
-  // Initiates shutdown on all running PluginProcessHost instances.
-  // Can be invoked on the main thread.
-  void Shutdown();
-
  private:
   friend struct DefaultSingletonTraits<PluginService>;
 
@@ -113,9 +109,6 @@ class PluginService {
   PluginService();
   ~PluginService();
 
-  // Shutdown handler which executes in the context of the IO thread.
-  void OnShutdown();
-
   // mapping between plugin path and PluginProcessHost
   typedef base::hash_map<FilePath, PluginProcessHost*> PluginMap;
   PluginMap plugin_hosts_;
@@ -136,26 +129,6 @@ class PluginService {
   // webkit_glue since this class is called on the main and IO thread.
   Lock lock_;
 
-  // Handles plugin process shutdown.
-  class ShutdownHandler : public base::RefCountedThreadSafe<ShutdownHandler> {
-   public:
-     ShutdownHandler() {}
-     ~ShutdownHandler() {}
-
-     // Initiates plugin process shutdown. Ensures that the actual shutdown
-     // happens on the io thread.
-     void InitiateShutdown();
-
-   private:
-    // Shutdown handler which runs on the io thread.
-    void OnShutdown();
-
-    DISALLOW_COPY_AND_ASSIGN(ShutdownHandler);
-  };
-
-  friend class ShutdownHandler;
-  scoped_refptr<ShutdownHandler> plugin_shutdown_handler_;
-
   DISALLOW_COPY_AND_ASSIGN(PluginService);
 };