From ba0ad5cfc951e80eea8b6a8c3ac2ddd02762b8df Mon Sep 17 00:00:00 2001 From: "sgk@google.com" <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> Date: Tue, 11 Aug 2009 20:56:18 +0000 Subject: Revert 23064 - Ensure we don't load plugins on the IO thread 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 TBR=jam@chromium.org Review URL: http://codereview.chromium.org/165321 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23073 0039d316-1c4b-4281-b951-d872f2087c98 --- .../browser/renderer_host/buffered_resource_handler.h | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'chrome/browser/renderer_host/buffered_resource_handler.h') diff --git a/chrome/browser/renderer_host/buffered_resource_handler.h b/chrome/browser/renderer_host/buffered_resource_handler.h index b36ac9b..3799b99 100644 --- a/chrome/browser/renderer_host/buffered_resource_handler.h +++ b/chrome/browser/renderer_host/buffered_resource_handler.h @@ -49,22 +49,6 @@ class BufferedResourceHandler : public ResourceHandler { // this is invoked from |OnResponseCompleted|. bool CompleteResponseStarted(int request_id, bool in_complete); - // Returns true if we have to wait until the plugin list is generated. - bool ShouldWaitForPlugins(); - - // A test to determining whether the request should be forwarded to the - // download thread. If need_plugin_list was passed in and was set to true, - // that means that the check couldn't be fully done because the plugins aren't - // loaded. The function should be called again after the plugin list is - // loaded. - bool ShouldDownload(bool* need_plugin_list); - - // Called on the file thread to load the list of plugins. - void LoadPlugins(); - - // Called on the IO thread once the list of plugins has been loaded. - void OnPluginsLoaded(); - scoped_refptr<ResourceHandler> real_handler_; scoped_refptr<ResourceResponse> response_; ResourceDispatcherHost* host_; @@ -75,7 +59,6 @@ class BufferedResourceHandler : public ResourceHandler { int bytes_read_; bool sniff_content_; bool should_buffer_; - bool wait_for_plugins_; bool buffering_; bool finished_; -- cgit v1.1