BASELINE: Update Chromium to 92.0.4515.166

Change-Id: I42a050486714e9e54fc271f2a8939223a02ae364

1 files changed, 13 insertions, 13 deletions

diff --git a/chromium/net/dns/record_rdata.cc b/chromium/net/dns/record_rdata.cc
index cd46be75c18..c2571482d07 100644
--- a/chromium/net/dns/record_rdata.cc
+++ b/chromium/net/dns/record_rdata.cc
@@ -64,7 +64,7 @@ std::unique_ptr<SrvRecordRdata> SrvRecordRdata::Create(
     const base::StringPiece& data,
     const DnsRecordParser& parser) {
   if (!HasValidSize(data, kType))
-    return std::unique_ptr<SrvRecordRdata>();
+    return nullptr;
 
   std::unique_ptr<SrvRecordRdata> rdata(new SrvRecordRdata);
 
@@ -76,7 +76,7 @@ std::unique_ptr<SrvRecordRdata> SrvRecordRdata::Create(
 
   if (!parser.ReadName(data.substr(kSrvRecordMinimumSize).begin(),
                        &rdata->target_))
-    return std::unique_ptr<SrvRecordRdata>();
+    return nullptr;
 
   return rdata;
 }
@@ -103,7 +103,7 @@ std::unique_ptr<ARecordRdata> ARecordRdata::Create(
     const base::StringPiece& data,
     const DnsRecordParser& parser) {
   if (!HasValidSize(data, kType))
-    return std::unique_ptr<ARecordRdata>();
+    return nullptr;
 
   std::unique_ptr<ARecordRdata> rdata(new ARecordRdata);
   rdata->address_ =
@@ -130,7 +130,7 @@ std::unique_ptr<AAAARecordRdata> AAAARecordRdata::Create(
     const base::StringPiece& data,
     const DnsRecordParser& parser) {
   if (!HasValidSize(data, kType))
-    return std::unique_ptr<AAAARecordRdata>();
+    return nullptr;
 
   std::unique_ptr<AAAARecordRdata> rdata(new AAAARecordRdata);
   rdata->address_ =
@@ -159,7 +159,7 @@ std::unique_ptr<CnameRecordRdata> CnameRecordRdata::Create(
   std::unique_ptr<CnameRecordRdata> rdata(new CnameRecordRdata);
 
   if (!parser.ReadName(data.begin(), &rdata->cname_))
-    return std::unique_ptr<CnameRecordRdata>();
+    return nullptr;
 
   return rdata;
 }
@@ -186,7 +186,7 @@ std::unique_ptr<PtrRecordRdata> PtrRecordRdata::Create(
   std::unique_ptr<PtrRecordRdata> rdata(new PtrRecordRdata);
 
   if (!parser.ReadName(data.begin(), &rdata->ptrdomain_))
-    return std::unique_ptr<PtrRecordRdata>();
+    return nullptr;
 
   return rdata;
 }
@@ -215,7 +215,7 @@ std::unique_ptr<TxtRecordRdata> TxtRecordRdata::Create(
     uint8_t length = data[i];
 
     if (i + length >= data.size())
-      return std::unique_ptr<TxtRecordRdata>();
+      return nullptr;
 
     rdata->texts_.push_back(std::string(data.substr(i + 1, length)));
 
@@ -253,7 +253,7 @@ std::unique_ptr<NsecRecordRdata> NsecRecordRdata::Create(
   // If we did not succeed in getting the next domain or the data length
   // is too short for reading the bitmap header, return.
   if (next_domain_length == 0 || data.length() < next_domain_length + 2)
-    return std::unique_ptr<NsecRecordRdata>();
+    return nullptr;
 
   struct BitmapHeader {
     uint8_t block_number;  // The block number should be zero.
@@ -266,14 +266,14 @@ std::unique_ptr<NsecRecordRdata> NsecRecordRdata::Create(
   // The block number must be zero in mDns-specific NSEC records. The bitmap
   // length must be between 1 and 32.
   if (header->block_number != 0 || header->length == 0 || header->length > 32)
-    return std::unique_ptr<NsecRecordRdata>();
+    return nullptr;
 
   base::StringPiece bitmap_data = data.substr(next_domain_length + 2);
 
   // Since we may only have one block, the data length must be exactly equal to
   // the domain length plus bitmap size.
   if (bitmap_data.length() != header->length)
-    return std::unique_ptr<NsecRecordRdata>();
+    return nullptr;
 
   rdata->bitmap_.insert(rdata->bitmap_.begin(),
                         bitmap_data.begin(),
@@ -325,7 +325,7 @@ std::unique_ptr<OptRecordRdata> OptRecordRdata::Create(
 
     if (!(reader.ReadU16(&opt_code) && reader.ReadU16(&opt_data_size) &&
           reader.ReadPiece(&opt_data, opt_data_size))) {
-      return std::unique_ptr<OptRecordRdata>();
+      return nullptr;
     }
     rdata->opts_.push_back(Opt(opt_code, opt_data));
   }
@@ -455,9 +455,9 @@ IntegrityRecordRdata IntegrityRecordRdata::Random() {
   return IntegrityRecordRdata(std::move(nonce));
 }
 
-base::Optional<std::vector<uint8_t>> IntegrityRecordRdata::Serialize() const {
+absl::optional<std::vector<uint8_t>> IntegrityRecordRdata::Serialize() const {
   if (!is_intact_) {
-    return base::nullopt;
+    return absl::nullopt;
   }
 
   // Create backing buffer and writer.