# Disables file download quarantining --- a/content/browser/renderer_host/pepper/pepper_file_io_host.cc +++ b/content/browser/renderer_host/pepper/pepper_file_io_host.cc @@ -21,7 +21,6 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/storage_partition.h" #include "content/public/common/content_client.h" -#include "content/public/common/quarantine.h" #include "ipc/ipc_platform_file.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_file_io.h" @@ -450,7 +449,7 @@ void PepperFileIOHost::OnLocalFileOpened ppapi::host::ReplyMessageContext reply_context, const base::FilePath& path, base::File::Error error_code) { -#if defined(OS_WIN) || defined(OS_LINUX) +#if 0 // Quarantining a file before its contents are available is only supported on // Windows and Linux. if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) { @@ -471,7 +470,7 @@ void PepperFileIOHost::OnLocalFileOpened #endif } -#if defined(OS_WIN) || defined(OS_LINUX) +#if 0 void PepperFileIOHost::OnLocalFileQuarantined( ppapi::host::ReplyMessageContext reply_context, const base::FilePath& path, --- a/content/browser/renderer_host/pepper/pepper_file_io_host.h +++ b/content/browser/renderer_host/pepper/pepper_file_io_host.h @@ -15,7 +15,6 @@ #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" -#include "content/public/common/quarantine.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_platform_file.h" #include "ppapi/c/pp_file_info.h" @@ -87,10 +86,6 @@ class PepperFileIOHost : public ppapi::h const base::FilePath& path, base::File::Error error_code); - void OnLocalFileQuarantined(ppapi::host::ReplyMessageContext reply_context, - const base::FilePath& path, - QuarantineFileResult quarantine_result); - void SendFileOpenReply(ppapi::host::ReplyMessageContext reply_context, base::File::Error error_code); --- a/content/common/quarantine/quarantine.cc +++ b/content/common/quarantine/quarantine.cc @@ -6,8 +6,6 @@ #include "build/build_config.h" -#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_LINUX) - namespace content { QuarantineFileResult QuarantineFile(const base::FilePath& file, @@ -24,5 +22,3 @@ bool IsFileQuarantined(const base::FileP } } // namespace content - -#endif // !WIN && !MAC && !LINUX --- a/content/public/common/BUILD.gn +++ b/content/public/common/BUILD.gn @@ -195,7 +195,6 @@ source_set("common_sources") { "push_messaging_status.cc", "push_messaging_status.h", "push_subscription_options.h", - "quarantine.h", "referrer.cc", "referrer.h", "renderer_preferences.cc",