Update chrome_Cleaner's zip_archiver subdir to support quarantine feature

Includes a fix to ComputeSHA256DigestOfPath required by the unit test

R=csharp@chromium.org

Bug: 830892
Change-Id: I72e6c1a4fcf21565357e5e6043ee93b480931a4f
Reviewed-on: https://chromium-review.googlesource.com/c/1338659Reviewed-by: Chris Sharp <csharp@chromium.org>
Commit-Queue: Joe Mason <joenotcharles@google.com>
Cr-Commit-Position: refs/heads/master@{#608794}

chrome/chrome_cleaner/os/disk_util.cc

@@ -590,7 +590,8 @@ bool ComputeSHA256DigestOfPath(const base::FilePath& path,
                                std::string* digest) {
   DCHECK(digest);
 
-  base::File file(path, base::File::FLAG_OPEN | base::File::FLAG_READ);
+  base::File file(path, base::File::FLAG_OPEN | base::File::FLAG_READ |
+                            base::File::FLAG_SHARE_DELETE);
   if (!file.IsValid())
     return false;
 

chrome/chrome_cleaner/os/file_removal_status_updater.h

@@ -31,7 +31,7 @@ enum RemovalStatusOverridePermission {
   // when previous knowledge was FAILED_TO_REMOVE.
   kOkToOverride,
   // This should never happen in the code, and we should raise an error.
-  // TODO: Currently there is no error, and kNotAllowed is
+  // TODO(joenotcharles): Currently there is no error, and kNotAllowed is
   // implemented as kSkip. This is because DCHECK writes an error message to
   // the log, and until recently this took the logging lock which might already
   // be held while checking this permission. Now that it's safe to DCHECK while

chrome/chrome_cleaner/zip_archiver/BUILD.gn

@@ -9,8 +9,10 @@ static_library("common") {
   ]
 
   deps = [
+    "//chrome/chrome_cleaner/constants:quarantine_constants",
     "//chrome/chrome_cleaner/interfaces:zip_archiver_interface",
     "//chrome/chrome_cleaner/ipc:mojo_task_runner",
+    "//chrome/chrome_cleaner/ipc:sandbox",
     "//chrome/chrome_cleaner/os:common_os",
     "//chrome/chrome_cleaner/zip_archiver/broker:common",
     "//mojo/public/cpp/system:system",
@@ -41,6 +43,7 @@ source_set("unittest_sources") {
 
   deps = [
     "//base/test:test_support",
+    "//chrome/chrome_cleaner/constants:quarantine_constants",
     "//chrome/chrome_cleaner/interfaces:zip_archiver_interface",
     "//chrome/chrome_cleaner/ipc:mojo_task_runner",
     "//chrome/chrome_cleaner/os:common_os",

chrome/chrome_cleaner/zip_archiver/DEPS

 include_rules = [
   "+third_party/zlib",
 ]
-

chrome/chrome_cleaner/zip_archiver/sandboxed_zip_archiver.h

@@ -15,25 +15,34 @@
 #include "base/sequenced_task_runner.h"
 #include "chrome/chrome_cleaner/interfaces/zip_archiver.mojom.h"
 #include "chrome/chrome_cleaner/ipc/mojo_task_runner.h"
+#include "chrome/chrome_cleaner/ipc/sandbox.h"
 #include "chrome/chrome_cleaner/zip_archiver/broker/sandbox_setup.h"
 
 namespace chrome_cleaner {
 
+namespace internal {
+
+base::string16 ConstructZipArchiveFileName(const base::string16& filename,
+                                           const std::string& file_hash);
+
+}  // namespace internal
+
 class SandboxedZipArchiver {
  public:
+  using ArchiveResultCallback =
+      base::OnceCallback<void(mojom::ZipArchiverResultCode)>;
+
   SandboxedZipArchiver(scoped_refptr<MojoTaskRunner> mojo_task_runner,
                        UniqueZipArchiverPtr zip_archiver_ptr,
                        const base::FilePath& dst_archive_folder,
                        const std::string& zip_password);
   ~SandboxedZipArchiver();
 
-  mojom::ZipArchiverResultCode Archive(const base::FilePath& src_file_path,
-                                       base::FilePath* output_zip_file_path);
+  void Archive(const base::FilePath& src_file_path,
+               ArchiveResultCallback result_callback);
 
  private:
-  mojom::ZipArchiverResultCode DoArchive(base::File src_file,
-                                         base::File zip_file,
-                                         const std::string& filename_in_zip);
+  mojom::ZipArchiverResultCode CheckFileSize(base::File* file);
 
   scoped_refptr<MojoTaskRunner> mojo_task_runner_;
   UniqueZipArchiverPtr zip_archiver_ptr_;
@@ -45,7 +54,7 @@ ResultCode SpawnZipArchiverSandbox(
     const base::FilePath& dst_archive_folder,
     const std::string& zip_password,
     scoped_refptr<MojoTaskRunner> mojo_task_runner,
-    base::OnceClosure connection_error_handler,
+    const SandboxConnectionErrorCallback& connection_error_callback,
     std::unique_ptr<SandboxedZipArchiver>* sandboxed_zip_archiver);
 
 }  // namespace chrome_cleaner