Ensure we don't load plugins on the IO thread.

I had to move the locks from PluginService to PluginList, so that a lock (which can block other threads) isn't held while loading the plugins.

BUG=17938
TEST=added asserts which crash if plugins loaded on IO thread, current UI tests exercise them
Review URL: http://codereview.chromium.org/164305

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

1 files changed, 1 insertions, 7 deletions

diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.h b/chrome/browser/renderer_host/resource_dispatcher_host.h
index 5353562..e36e97f 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.h
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.h
@@ -108,6 +108,7 @@ class ResourceDispatcherHost : public URLRequest::Delegate {
           has_started_reading(false),
           paused_read_bytes(0) {
     }
+    virtual ~ExtraRequestInfo() { resource_handler->OnRequestClosed(); }
 
     // Top-level ResourceHandler servicing this request.
     scoped_refptr<ResourceHandler> resource_handler;
@@ -352,11 +353,6 @@ class ResourceDispatcherHost : public URLRequest::Delegate {
   // Retrieves a URLRequest.  Must be called from the IO thread.
   URLRequest* GetURLRequest(GlobalRequestID request_id) const;
 
-  // A test to determining whether a given request should be forwarded to the
-  // download thread.
-  bool ShouldDownload(const std::string& mime_type,
-                      const std::string& content_disposition);
-
   // Notifies our observers that a request has been cancelled.
   void NotifyResponseCompleted(URLRequest* request, int process_id);
 
@@ -551,8 +547,6 @@ class ResourceDispatcherHost : public URLRequest::Delegate {
   // List of objects observing resource dispatching.
   ObserverList<Observer> observer_list_;
 
-  PluginService* plugin_service_;
-
   // For running tasks.
   ScopedRunnableMethodFactory<ResourceDispatcherHost> method_runner_;