BASELINE: Update Chromium to 92.0.4515.166

Change-Id: I42a050486714e9e54fc271f2a8939223a02ae364

6 files changed, 9 insertions, 11 deletions

diff --git a/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist.cc b/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist.cc
index 0aa180dd92b..ee456cc7a46 100644
--- a/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist.cc
+++ b/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist.cc
@@ -7,12 +7,11 @@
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram.h"
-#include "base/optional.h"
-#include "base/strings/stringprintf.h"
 #include "base/time/clock.h"
 #include "components/blocklist/opt_out_blocklist/opt_out_blocklist_delegate.h"
 #include "components/blocklist/opt_out_blocklist/opt_out_blocklist_item.h"
 #include "components/blocklist/opt_out_blocklist/opt_out_store.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace blocklist {
 
diff --git a/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist.h b/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist.h
index ece381483fe..822ad6dc68a 100644
--- a/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist.h
+++ b/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist.h
@@ -16,10 +16,10 @@
 #include "base/containers/queue.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "base/optional.h"
 #include "base/sequence_checker.h"
 #include "base/time/time.h"
 #include "components/blocklist/opt_out_blocklist/opt_out_blocklist_data.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace base {
 class Clock;
diff --git a/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist_data.cc b/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist_data.cc
index 711e409fd42..67a0d049bad 100644
--- a/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist_data.cc
+++ b/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist_data.cc
@@ -139,10 +139,10 @@ BlocklistReason BlocklistData::IsAllowed(
 
 void BlocklistData::EvictOldestHost() {
   DCHECK_LT(max_hosts_, block_list_item_host_map_.size());
-  base::Optional<base::Time> oldest_opt_out;
+  absl::optional<base::Time> oldest_opt_out;
   std::string key_to_delete;
   for (auto& item : block_list_item_host_map_) {
-    base::Optional<base::Time> most_recent_opt_out =
+    absl::optional<base::Time> most_recent_opt_out =
         item.second.most_recent_opt_out_time();
     if (!most_recent_opt_out) {
       // If there is no opt out time, this is a good choice to evict.
diff --git a/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist_data.h b/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist_data.h
index 659d1e26c74..f07b089b8af 100644
--- a/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist_data.h
+++ b/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist_data.h
@@ -13,9 +13,9 @@
 #include <string>
 
 #include "base/macros.h"
-#include "base/optional.h"
 #include "base/time/time.h"
 #include "components/blocklist/opt_out_blocklist/opt_out_blocklist_item.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace blocklist {
 
diff --git a/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist_item.h b/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist_item.h
index 1ad6c01c1e5..158260d6fb2 100644
--- a/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist_item.h
+++ b/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist_item.h
@@ -10,12 +10,11 @@
 #include <map>
 #include <memory>
 #include <queue>
-#include <string>
 
 #include "base/callback.h"
 #include "base/macros.h"
-#include "base/optional.h"
 #include "base/time/time.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace blocklist {
 
@@ -39,7 +38,7 @@ class OptOutBlocklistItem {
   // Whether the action corresponding to |this| should be disallowed.
   bool IsBlockListed(base::Time now) const;
 
-  base::Optional<base::Time> most_recent_opt_out_time() const {
+  absl::optional<base::Time> most_recent_opt_out_time() const {
     return most_recent_opt_out_time_;
   }
 
@@ -86,7 +85,7 @@ class OptOutBlocklistItem {
   std::priority_queue<OptOutRecord> opt_out_records_;
 
   // Time of the most recent opt out.
-  base::Optional<base::Time> most_recent_opt_out_time_;
+  absl::optional<base::Time> most_recent_opt_out_time_;
 
   // The total number of opt outs currently in |opt_out_records_|.
   int total_opt_out_;
diff --git a/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist_item_unittest.cc b/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist_item_unittest.cc
index c54bc22dfea..68d495c1265 100644
--- a/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist_item_unittest.cc
+++ b/chromium/components/blocklist/opt_out_blocklist/opt_out_blocklist_item_unittest.cc
@@ -6,9 +6,9 @@
 
 #include <memory>
 
-#include "base/optional.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace {