commit 4fa66caa136303294cabb33a634c6ccf18926280
author Elliott Hughes <enh@google.com> Thu Jan 07 21:33:34 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 07 21:33:34 2021 +0000
tree 05c19f85e69338c534b0ab9f946fcb12a4988ddd
parent fdaea72c2ce41fe5d8af15fd37ac09667a056a9c
parent 8472b6c51dc2069187e370a4ea1908de18c568cd

Merge "Distinguish between host and device x86."

DIR_METADATA

diff --git a/DIR_METADATA b/DIR_METADATA
new file mode 100644
index 0000000..d366dc7
--- /dev/null
+++ b/DIR_METADATA
@@ -0,0 +1,3 @@
+monorail: {
+  component: "Internals"
+}

METADATA

diff --git a/METADATA b/METADATA
index eb872a6..134d2c1 100644
--- a/METADATA
+++ b/METADATA
@@ -5,11 +5,11 @@
     type: GIT
     value: "https://chromium.googlesource.com/chromium/src/third_party/zlib/"
   }
-  version: "9893e506b3a7ea4ec68e1fcd9a374e849945f405"
+  version: "2c183c9f93a328bfb3121284da13cf89a0f7e64a"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2020
-    month: 11
-    day: 30
+    year: 2021
+    month: 1
+    day: 5
   }
 }

OWNERS

diff --git a/OWNERS b/OWNERS
index 22f4d89..632b3f9 100644
--- a/OWNERS
+++ b/OWNERS
@@ -3,5 +3,3 @@
 cblume@chromium.org
 mtklein@google.com
 scroggo@google.com
-
-# COMPONENT: Internals

google/zip_reader.cc

diff --git a/google/zip_reader.cc b/google/zip_reader.cc
index 8b4bb4a..96e9ff0 100644
--- a/google/zip_reader.cc
+++ b/google/zip_reader.cc
@@ -10,10 +10,9 @@
 #include "base/files/file.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/threading/thread_task_runner_handle.h"
+#include "base/threading/sequenced_task_runner_handle.h"
 #include "build/build_config.h"
 #include "third_party/zlib/google/zip_internal.h"
 
@@ -296,11 +295,11 @@
   // If this is a directory, just create it and return.
   if (current_entry_info()->is_directory()) {
     if (base::CreateDirectory(output_file_path)) {
-      base::ThreadTaskRunnerHandle::Get()->PostTask(
+      base::SequencedTaskRunnerHandle::Get()->PostTask(
           FROM_HERE, std::move(success_callback));
     } else {
       DVLOG(1) << "Unzip failed: unable to create directory.";
-      base::ThreadTaskRunnerHandle::Get()->PostTask(
+      base::SequencedTaskRunnerHandle::Get()->PostTask(
           FROM_HERE, std::move(failure_callback));
     }
     return;
@@ -308,16 +307,16 @@
 
   if (unzOpenCurrentFile(zip_file_) != UNZ_OK) {
     DVLOG(1) << "Unzip failed: unable to open current zip entry.";
-    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
-                                                  std::move(failure_callback));
+    base::SequencedTaskRunnerHandle::Get()->PostTask(
+        FROM_HERE, std::move(failure_callback));
     return;
   }
 
   base::FilePath output_dir_path = output_file_path.DirName();
   if (!base::CreateDirectory(output_dir_path)) {
     DVLOG(1) << "Unzip failed: unable to create containing directory.";
-    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
-                                                  std::move(failure_callback));
+    base::SequencedTaskRunnerHandle::Get()->PostTask(
+        FROM_HERE, std::move(failure_callback));
     return;
   }
 
@@ -327,12 +326,12 @@
   if (!output_file.IsValid()) {
     DVLOG(1) << "Unzip failed: unable to create platform file at "
              << output_file_path.value();
-    base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
-                                                  std::move(failure_callback));
+    base::SequencedTaskRunnerHandle::Get()->PostTask(
+        FROM_HERE, std::move(failure_callback));
     return;
   }
 
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
+  base::SequencedTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::BindOnce(&ZipReader::ExtractChunk, weak_ptr_factory_.GetWeakPtr(),
                      Passed(std::move(output_file)),
@@ -434,7 +433,7 @@
 
     progress_callback.Run(current_progress);
 
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
+    base::SequencedTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::BindOnce(&ZipReader::ExtractChunk, weak_ptr_factory_.GetWeakPtr(),
                        Passed(std::move(output_file)),