diff options
| author | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 08:13:32 +0000 |
|---|---|---|
| committer | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 08:13:32 +0000 |
| commit | 2aba99da8333d9fe2df2b1bea3bbd0cef5ed5079 (patch) | |
| tree | 9af888de53885b74fbae58da5dd341f185f4972e /content/browser/renderer_host/render_process_host_impl.cc | |
| parent | c1cd7cd71b0d659692e22f49bcf55cc6869cf28b (diff) | |
| download | chromium_src-2aba99da8333d9fe2df2b1bea3bbd0cef5ed5079.zip chromium_src-2aba99da8333d9fe2df2b1bea3bbd0cef5ed5079.tar.gz chromium_src-2aba99da8333d9fe2df2b1bea3bbd0cef5ed5079.tar.bz2 | |
Merge BlobMessageFilter and FileSystemDispatcherHost into FileAndBlobMessageFilter.
So that we can handle files and blobs in a unified way.
BUG=115603
TEST="existing tests should pass"
Review URL: http://codereview.chromium.org/9514010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124152 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/render_process_host_impl.cc')
| -rw-r--r-- | content/browser/renderer_host/render_process_host_impl.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 90dc78d..2717a4e 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -46,7 +46,7 @@ #include "content/browser/chrome_blob_storage_context.h" #include "content/browser/device_orientation/message_filter.h" #include "content/browser/download/mhtml_generation_manager.h" -#include "content/browser/file_system/file_system_dispatcher_host.h" +#include "content/browser/file_system/file_and_blob_message_filter.h" #include "content/browser/geolocation/geolocation_dispatcher_host.h" #include "content/browser/gpu/gpu_data_manager_impl.h" #include "content/browser/gpu/gpu_process_host.h" @@ -57,7 +57,6 @@ #include "content/browser/mime_registry_message_filter.h" #include "content/browser/plugin_service_impl.h" #include "content/browser/profiler_message_filter.h" -#include "content/browser/renderer_host/blob_message_filter.h" #include "content/browser/renderer_host/clipboard_message_filter.h" #include "content/browser/renderer_host/database_message_filter.h" #include "content/browser/renderer_host/file_utilities_message_filter.h" @@ -500,13 +499,12 @@ void RenderProcessHostImpl::CreateMessageFilters() { browser_context->GetSpeechInputPreferences(), content::BrowserMainLoop::GetAudioManager())); #endif - channel_->AddFilter(new FileSystemDispatcherHost( + channel_->AddFilter(new FileAndBlobMessageFilter( + GetID(), browser_context->GetRequestContext(), BrowserContext::GetFileSystemContext(browser_context), ChromeBlobStorageContext::GetFor(browser_context))); channel_->AddFilter(new device_orientation::MessageFilter()); - channel_->AddFilter(new BlobMessageFilter(GetID(), - ChromeBlobStorageContext::GetFor(browser_context))); channel_->AddFilter(new FileUtilitiesMessageFilter(GetID())); channel_->AddFilter(new MimeRegistryMessageFilter()); channel_->AddFilter(new DatabaseMessageFilter( |