BASELINE: Update Chromium to 92.0.4515.166

Change-Id: I42a050486714e9e54fc271f2a8939223a02ae364

8 files changed, 15 insertions, 24 deletions

diff --git a/chromium/components/openscreen_platform/BUILD.gn b/chromium/components/openscreen_platform/BUILD.gn
index 928f8e962cc..c57f5b54792 100644
--- a/chromium/components/openscreen_platform/BUILD.gn
+++ b/chromium/components/openscreen_platform/BUILD.gn
@@ -26,7 +26,6 @@ source_set("openscreen_platform") {
 # //net-based implementation of UdpSocket.
 # Incompatible with ":openscreen_platform_network_service".
 source_set("openscreen_platform_net") {
-  testonly = true
   sources = [
     "net_udp_socket.cc",
     "net_udp_socket.h",
diff --git a/chromium/components/openscreen_platform/net_udp_socket.h b/chromium/components/openscreen_platform/net_udp_socket.h
index d7f631901f9..ad7703d38f3 100644
--- a/chromium/components/openscreen_platform/net_udp_socket.h
+++ b/chromium/components/openscreen_platform/net_udp_socket.h
@@ -5,8 +5,6 @@
 #ifndef COMPONENTS_OPENSCREEN_PLATFORM_NET_UDP_SOCKET_H_
 #define COMPONENTS_OPENSCREEN_PLATFORM_NET_UDP_SOCKET_H_
 
-#include <memory>
-
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/socket/udp_socket.h"
diff --git a/chromium/components/openscreen_platform/network_util.h b/chromium/components/openscreen_platform/network_util.h
index a236af23b45..c59ead1bba4 100644
--- a/chromium/components/openscreen_platform/network_util.h
+++ b/chromium/components/openscreen_platform/network_util.h
@@ -5,8 +5,6 @@
 #ifndef COMPONENTS_OPENSCREEN_PLATFORM_NETWORK_UTIL_H_
 #define COMPONENTS_OPENSCREEN_PLATFORM_NETWORK_UTIL_H_
 
-#include <memory>
-
 #include "net/base/address_family.h"
 #include "third_party/openscreen/src/platform/base/ip_address.h"
 
diff --git a/chromium/components/openscreen_platform/tls_connection_factory.cc b/chromium/components/openscreen_platform/tls_connection_factory.cc
index 01424aa304f..c9d390fbbe2 100644
--- a/chromium/components/openscreen_platform/tls_connection_factory.cc
+++ b/chromium/components/openscreen_platform/tls_connection_factory.cc
@@ -89,7 +89,7 @@ void TlsConnectionFactory::Connect(const IPEndpoint& remote_address,
       request.tcp_socket.BindNewPipeAndPassReceiver();
 
   network_context->CreateTCPConnectedSocket(
-      base::nullopt /* local_addr */, address_list,
+      absl::nullopt /* local_addr */, address_list,
       nullptr /* tcp_connected_socket_options */,
       net::MutableNetworkTrafficAnnotationTag(kTrafficAnnotation),
       std::move(receiver), mojo::NullRemote(), /* observer */
@@ -146,8 +146,8 @@ TlsConnectionFactory::TlsUpgradeRequest::~TlsUpgradeRequest() = default;
 void TlsConnectionFactory::OnTcpConnect(
     TcpConnectRequest request,
     int32_t net_result,
-    const base::Optional<net::IPEndPoint>& local_address,
-    const base::Optional<net::IPEndPoint>& remote_address,
+    const absl::optional<net::IPEndPoint>& local_address,
+    const absl::optional<net::IPEndPoint>& remote_address,
     mojo::ScopedDataPipeConsumerHandle receive_stream,
     mojo::ScopedDataPipeProducerHandle send_stream) {
   // We only care about net_result, since local_address doesn't matter,
@@ -194,7 +194,7 @@ void TlsConnectionFactory::OnTlsUpgrade(
     int32_t net_result,
     mojo::ScopedDataPipeConsumerHandle receive_stream,
     mojo::ScopedDataPipeProducerHandle send_stream,
-    const base::Optional<net::SSLInfo>& ssl_info) {
+    const absl::optional<net::SSLInfo>& ssl_info) {
   if (net_result != net::OK) {
     client_->OnConnectionFailed(this, request.remote_address);
     return;
diff --git a/chromium/components/openscreen_platform/tls_connection_factory.h b/chromium/components/openscreen_platform/tls_connection_factory.h
index 4804c63392d..379aec3c06a 100644
--- a/chromium/components/openscreen_platform/tls_connection_factory.h
+++ b/chromium/components/openscreen_platform/tls_connection_factory.h
@@ -5,8 +5,6 @@
 #ifndef COMPONENTS_OPENSCREEN_PLATFORM_TLS_CONNECTION_FACTORY_H_
 #define COMPONENTS_OPENSCREEN_PLATFORM_TLS_CONNECTION_FACTORY_H_
 
-#include <memory>
-
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver.h"
@@ -91,8 +89,8 @@ class TlsConnectionFactory final : public openscreen::TlsConnectionFactory {
 
   void OnTcpConnect(TcpConnectRequest request,
                     int32_t net_result,
-                    const base::Optional<net::IPEndPoint>& local_address,
-                    const base::Optional<net::IPEndPoint>& remote_address,
+                    const absl::optional<net::IPEndPoint>& local_address,
+                    const absl::optional<net::IPEndPoint>& remote_address,
                     mojo::ScopedDataPipeConsumerHandle receive_stream,
                     mojo::ScopedDataPipeProducerHandle send_stream);
 
@@ -100,7 +98,7 @@ class TlsConnectionFactory final : public openscreen::TlsConnectionFactory {
                     int32_t net_result,
                     mojo::ScopedDataPipeConsumerHandle receive_stream,
                     mojo::ScopedDataPipeProducerHandle send_stream,
-                    const base::Optional<net::SSLInfo>& ssl_info);
+                    const absl::optional<net::SSLInfo>& ssl_info);
 
   openscreen::TlsConnectionFactory::Client* client_;
   openscreen::TaskRunner* const task_runner_;
diff --git a/chromium/components/openscreen_platform/tls_connection_factory_unittest.cc b/chromium/components/openscreen_platform/tls_connection_factory_unittest.cc
index e92fc7e7e5a..5f479911b25 100644
--- a/chromium/components/openscreen_platform/tls_connection_factory_unittest.cc
+++ b/chromium/components/openscreen_platform/tls_connection_factory_unittest.cc
@@ -65,7 +65,7 @@ class MockTlsConnectionFactoryClient
 class FakeNetworkContext : public network::TestNetworkContext {
  public:
   void CreateTCPConnectedSocket(
-      const base::Optional<net::IPEndPoint>& local_addr,
+      const absl::optional<net::IPEndPoint>& local_addr,
       const net::AddressList& remote_addr_list,
       network::mojom::TCPConnectedSocketOptionsPtr tcp_connected_socket_options,
       const net::MutableNetworkTrafficAnnotationTag& traffic_annotation,
@@ -79,7 +79,7 @@ class FakeNetworkContext : public network::TestNetworkContext {
   int times_called() { return times_called_; }
 
   void ExecuteCreateCallback(int32_t net_result) {
-    std::move(callback_).Run(net_result, base::nullopt, base::nullopt,
+    std::move(callback_).Run(net_result, absl::nullopt, absl::nullopt,
                              mojo::ScopedDataPipeConsumerHandle{},
                              mojo::ScopedDataPipeProducerHandle{});
   }
diff --git a/chromium/components/openscreen_platform/udp_socket.cc b/chromium/components/openscreen_platform/udp_socket.cc
index ab9aac553a1..9bbda2261ce 100644
--- a/chromium/components/openscreen_platform/udp_socket.cc
+++ b/chromium/components/openscreen_platform/udp_socket.cc
@@ -152,8 +152,8 @@ void UdpSocket::SetDscp(openscreen::UdpSocket::DscpMode state) {}
 
 void UdpSocket::OnReceived(
     int32_t net_result,
-    const base::Optional<net::IPEndPoint>& source_endpoint,
-    base::Optional<base::span<const uint8_t>> data) {
+    const absl::optional<net::IPEndPoint>& source_endpoint,
+    absl::optional<base::span<const uint8_t>> data) {
   if (net_result != net::OK) {
     client_->OnRead(this, Error::Code::kSocketReadFailure);
   } else if (data) {
@@ -170,7 +170,7 @@ void UdpSocket::OnReceived(
 }
 
 void UdpSocket::BindCallback(int32_t result,
-                             const base::Optional<net::IPEndPoint>& address) {
+                             const absl::optional<net::IPEndPoint>& address) {
   if (result != net::OK) {
     client_->OnError(this, Error(Error::Code::kSocketBindFailure,
                                  net::ErrorToString(result)));
diff --git a/chromium/components/openscreen_platform/udp_socket.h b/chromium/components/openscreen_platform/udp_socket.h
index 62b98ee24dd..c0fa1d9c201 100644
--- a/chromium/components/openscreen_platform/udp_socket.h
+++ b/chromium/components/openscreen_platform/udp_socket.h
@@ -5,8 +5,6 @@
 #ifndef COMPONENTS_OPENSCREEN_PLATFORM_UDP_SOCKET_H_
 #define COMPONENTS_OPENSCREEN_PLATFORM_UDP_SOCKET_H_
 
-#include <memory>
-
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver.h"
@@ -49,12 +47,12 @@ class UdpSocket final : public openscreen::UdpSocket,
 
   // network::mojom::UDPSocketListener overrides:
   void OnReceived(int32_t net_result,
-                  const base::Optional<net::IPEndPoint>& source_endpoint,
-                  base::Optional<base::span<const uint8_t>> data) override;
+                  const absl::optional<net::IPEndPoint>& source_endpoint,
+                  absl::optional<base::span<const uint8_t>> data) override;
 
  private:
   void BindCallback(int32_t result,
-                    const base::Optional<net::IPEndPoint>& address);
+                    const absl::optional<net::IPEndPoint>& address);
   void JoinGroupCallback(int32_t result);
   void SendCallback(int32_t result);