| Index: content/browser/renderer_host/render_message_filter.cc
|
| diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
|
| index e6abdca22504bfdf9efcee9a9b859d85099b4a12..bc5b2d25d78f19b48086c1ba90dd6a192caf4892 100644
|
| --- a/content/browser/renderer_host/render_message_filter.cc
|
| +++ b/content/browser/renderer_host/render_message_filter.cc
|
| @@ -23,8 +23,6 @@
|
| #include "content/browser/browser_main_loop.h"
|
| #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
|
| #include "content/browser/dom_storage/session_storage_namespace_impl.h"
|
| -#include "content/browser/download/download_stats.h"
|
| -#include "content/browser/fileapi/chrome_blob_storage_context.h"
|
| #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
|
| #include "content/browser/gpu/gpu_data_manager_impl.h"
|
| #include "content/browser/gpu/gpu_process_host.h"
|
| @@ -34,10 +32,8 @@
|
| #include "content/browser/renderer_host/render_process_host_impl.h"
|
| #include "content/browser/renderer_host/render_view_host_delegate.h"
|
| #include "content/browser/renderer_host/render_widget_helper.h"
|
| -#include "content/browser/resource_context_impl.h"
|
| #include "content/common/child_process_host_impl.h"
|
| #include "content/common/child_process_messages.h"
|
| -#include "content/common/content_constants_internal.h"
|
| #include "content/common/gpu/client/gpu_memory_buffer_impl.h"
|
| #include "content/common/host_shared_bitmap_manager.h"
|
| #include "content/common/render_process_messages.h"
|
| @@ -46,8 +42,6 @@
|
| #include "content/public/browser/browser_context.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/content_browser_client.h"
|
| -#include "content/public/browser/download_manager.h"
|
| -#include "content/public/browser/download_url_parameters.h"
|
| #include "content/public/browser/resource_context.h"
|
| #include "content/public/browser/user_metrics.h"
|
| #include "content/public/common/content_switches.h"
|
| @@ -67,7 +61,6 @@
|
| #include "net/url_request/url_request_context.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
| #include "ppapi/shared_impl/file_type_conversion.h"
|
| -#include "storage/browser/blob/blob_storage_context.h"
|
| #include "ui/gfx/color_profile.h"
|
| #include "url/gurl.h"
|
|
|
| @@ -106,21 +99,6 @@ base::LazyInstance<gfx::ColorProfile>::Leaky g_color_profile =
|
| LAZY_INSTANCE_INITIALIZER;
|
| #endif
|
|
|
| -void DownloadUrlOnUIThread(scoped_ptr<DownloadUrlParameters> parameters) {
|
| - DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| -
|
| - RenderProcessHost* render_process_host =
|
| - RenderProcessHost::FromID(parameters->render_process_host_id());
|
| - if (!render_process_host)
|
| - return;
|
| -
|
| - BrowserContext* browser_context = render_process_host->GetBrowserContext();
|
| - DownloadManager* download_manager =
|
| - BrowserContext::GetDownloadManager(browser_context);
|
| - RecordDownloadSource(INITIATED_BY_RENDERER);
|
| - download_manager->DownloadUrl(std::move(parameters));
|
| -}
|
| -
|
| } // namespace
|
|
|
| RenderMessageFilter::RenderMessageFilter(
|
| @@ -169,9 +147,6 @@ bool RenderMessageFilter::OnMessageReceived(const IPC::Message& message) {
|
| IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWidget, OnCreateWidget)
|
| IPC_MESSAGE_HANDLER(ViewHostMsg_CreateFullscreenWidget,
|
| OnCreateFullscreenWidget)
|
| - IPC_MESSAGE_HANDLER(ViewHostMsg_DownloadUrl, OnDownloadUrl)
|
| - IPC_MESSAGE_HANDLER(ViewHostMsg_SaveImageFromDataURL,
|
| - OnSaveImageFromDataURL)
|
| #if defined(OS_MACOSX)
|
| IPC_MESSAGE_HANDLER_GENERIC(
|
| ViewHostMsg_SwapCompositorFrame,
|
| @@ -390,61 +365,6 @@ void RenderMessageFilter::OnGetMonitorColorProfile(std::vector<char>* profile) {
|
|
|
| #endif // OS_*
|
|
|
| -void RenderMessageFilter::DownloadUrl(int render_view_id,
|
| - int render_frame_id,
|
| - const GURL& url,
|
| - const Referrer& referrer,
|
| - const base::string16& suggested_name,
|
| - const bool use_prompt) const {
|
| - if (!resource_context_)
|
| - return;
|
| -
|
| - scoped_ptr<DownloadUrlParameters> parameters(
|
| - new DownloadUrlParameters(url, render_process_id_, render_view_id,
|
| - render_frame_id, resource_context_));
|
| - parameters->set_content_initiated(true);
|
| - parameters->set_suggested_name(suggested_name);
|
| - parameters->set_prompt(use_prompt);
|
| - parameters->set_referrer(referrer);
|
| -
|
| - if (url.SchemeIsBlob()) {
|
| - ChromeBlobStorageContext* blob_context =
|
| - GetChromeBlobStorageContextForResourceContext(resource_context_);
|
| - parameters->set_blob_data_handle(
|
| - blob_context->context()->GetBlobDataFromPublicURL(url));
|
| - // Don't care if the above fails. We are going to let the download go
|
| - // through and allow it to be interrupted so that the embedder can deal.
|
| - }
|
| -
|
| - BrowserThread::PostTask(
|
| - BrowserThread::UI, FROM_HERE,
|
| - base::Bind(&DownloadUrlOnUIThread, base::Passed(¶meters)));
|
| -}
|
| -
|
| -void RenderMessageFilter::OnDownloadUrl(int render_view_id,
|
| - int render_frame_id,
|
| - const GURL& url,
|
| - const Referrer& referrer,
|
| - const base::string16& suggested_name) {
|
| - DownloadUrl(render_view_id, render_frame_id, url, referrer, suggested_name,
|
| - false);
|
| -}
|
| -
|
| -void RenderMessageFilter::OnSaveImageFromDataURL(int render_view_id,
|
| - int render_frame_id,
|
| - const std::string& url_str) {
|
| - // Please refer to RenderViewImpl::saveImageFromDataURL().
|
| - if (url_str.length() >= kMaxLengthOfDataURLString)
|
| - return;
|
| -
|
| - GURL data_url(url_str);
|
| - if (!data_url.SchemeIs(url::kDataScheme))
|
| - return;
|
| -
|
| - DownloadUrl(render_view_id, render_frame_id, data_url, Referrer(),
|
| - base::string16(), true);
|
| -}
|
| -
|
| void RenderMessageFilter::AllocateSharedMemoryOnFileThread(
|
| uint32_t buffer_size,
|
| IPC::Message* reply_msg) {
|
|
|