BASELINE: Update Chromium to 92.0.4515.166

Change-Id: I42a050486714e9e54fc271f2a8939223a02ae364

2 files changed, 8 insertions, 9 deletions

diff --git a/chromium/components/digital_asset_links/digital_asset_links_handler.cc b/chromium/components/digital_asset_links/digital_asset_links_handler.cc
index 0bc633ff9f3..72a7e391107 100644
--- a/chromium/components/digital_asset_links/digital_asset_links_handler.cc
+++ b/chromium/components/digital_asset_links/digital_asset_links_handler.cc
@@ -129,7 +129,7 @@ DigitalAssetLinksHandler::~DigitalAssetLinksHandler() = default;
 
 void DigitalAssetLinksHandler::OnURLLoadComplete(
     std::string relationship,
-    base::Optional<std::string> fingerprint,
+    absl::optional<std::string> fingerprint,
     std::map<std::string, std::set<std::string>> target_values,
     std::unique_ptr<std::string> response_body) {
   int response_code = -1;
@@ -166,7 +166,7 @@ void DigitalAssetLinksHandler::OnURLLoadComplete(
 
 void DigitalAssetLinksHandler::OnJSONParseResult(
     std::string relationship,
-    base::Optional<std::string> fingerprint,
+    absl::optional<std::string> fingerprint,
     std::map<std::string, std::set<std::string>> target_values,
     data_decoder::DataDecoder::ValueOrError result) {
   if (!result.value) {
@@ -245,14 +245,14 @@ bool DigitalAssetLinksHandler::CheckDigitalAssetLinkRelationshipForWebApk(
     const std::string& manifest_url,
     RelationshipCheckResultCallback callback) {
   return CheckDigitalAssetLinkRelationship(
-      web_domain, "delegate_permission/common.query_webapk", base::nullopt,
+      web_domain, "delegate_permission/common.query_webapk", absl::nullopt,
       {{"namespace", {"web"}}, {"site", {manifest_url}}}, std::move(callback));
 }
 
 bool DigitalAssetLinksHandler::CheckDigitalAssetLinkRelationship(
     const std::string& web_domain,
     const std::string& relationship,
-    const base::Optional<std::string>& fingerprint,
+    const absl::optional<std::string>& fingerprint,
     const std::map<std::string, std::set<std::string>>& target_values,
     RelationshipCheckResultCallback callback) {
   // TODO(peconn): Propagate the use of url::Origin backwards to clients.
diff --git a/chromium/components/digital_asset_links/digital_asset_links_handler.h b/chromium/components/digital_asset_links/digital_asset_links_handler.h
index d612ccdf37c..8d2177a5843 100644
--- a/chromium/components/digital_asset_links/digital_asset_links_handler.h
+++ b/chromium/components/digital_asset_links/digital_asset_links_handler.h
@@ -11,11 +11,10 @@
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
-#include "base/optional.h"
 #include "base/time/time.h"
-#include "base/values.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "services/data_decoder/public/cpp/data_decoder.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace network {
 class SharedURLLoaderFactory;
@@ -88,7 +87,7 @@ class DigitalAssetLinksHandler : public content::WebContentsObserver {
   bool CheckDigitalAssetLinkRelationship(
       const std::string& web_domain,
       const std::string& relationship,
-      const base::Optional<std::string>& fingerprint,
+      const absl::optional<std::string>& fingerprint,
       const std::map<std::string, std::set<std::string>>& target_values,
       RelationshipCheckResultCallback callback);
 
@@ -100,14 +99,14 @@ class DigitalAssetLinksHandler : public content::WebContentsObserver {
  private:
   void OnURLLoadComplete(
       std::string relationship,
-      base::Optional<std::string> fingerprint,
+      absl::optional<std::string> fingerprint,
       std::map<std::string, std::set<std::string>> target_values,
       std::unique_ptr<std::string> response_body);
 
   // Callback for the DataDecoder.
   void OnJSONParseResult(
       std::string relationship,
-      base::Optional<std::string> fingerprint,
+      absl::optional<std::string> fingerprint,
       std::map<std::string, std::set<std::string>> target_values,
       data_decoder::DataDecoder::ValueOrError result);