BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

9 files changed, 24 insertions, 18 deletions

diff --git a/chromium/net/tools/quic/quic_http_proxy_backend.h b/chromium/net/tools/quic/quic_http_proxy_backend.h
index 0852d70a557..32d9d6bb4bf 100644
--- a/chromium/net/tools/quic/quic_http_proxy_backend.h
+++ b/chromium/net/tools/quic/quic_http_proxy_backend.h
@@ -26,7 +26,6 @@
 
 #include "base/base64.h"
 #include "base/callback.h"
-#include "base/logging.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread.h"
diff --git a/chromium/net/tools/quic/quic_http_proxy_backend_stream.h b/chromium/net/tools/quic/quic_http_proxy_backend_stream.h
index 6d87391eb8a..80f8e2bc9a5 100644
--- a/chromium/net/tools/quic/quic_http_proxy_backend_stream.h
+++ b/chromium/net/tools/quic/quic_http_proxy_backend_stream.h
@@ -24,7 +24,6 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
-#include "base/logging.h"
 #include "base/macros.h"
 #include "net/base/request_priority.h"
 #include "net/base/upload_data_stream.h"
diff --git a/chromium/net/tools/quic/quic_simple_client.cc b/chromium/net/tools/quic/quic_simple_client.cc
index 5d8bf33b2a1..25fcab0a909 100644
--- a/chromium/net/tools/quic/quic_simple_client.cc
+++ b/chromium/net/tools/quic/quic_simple_client.cc
@@ -37,11 +37,12 @@ QuicSimpleClient::QuicSimpleClient(
     quic::QuicSocketAddress server_address,
     const quic::QuicServerId& server_id,
     const quic::ParsedQuicVersionVector& supported_versions,
+    const quic::QuicConfig& config,
     std::unique_ptr<quic::ProofVerifier> proof_verifier)
     : quic::QuicSpdyClientBase(
           server_id,
           supported_versions,
-          quic::QuicConfig(),
+          config,
           CreateQuicConnectionHelper(),
           CreateQuicAlarmFactory(),
           quic::QuicWrapUnique(
diff --git a/chromium/net/tools/quic/quic_simple_client.h b/chromium/net/tools/quic/quic_simple_client.h
index c791adefd75..3ac2841a68d 100644
--- a/chromium/net/tools/quic/quic_simple_client.h
+++ b/chromium/net/tools/quic/quic_simple_client.h
@@ -41,6 +41,7 @@ class QuicSimpleClient : public quic::QuicSpdyClientBase {
   QuicSimpleClient(quic::QuicSocketAddress server_address,
                    const quic::QuicServerId& server_id,
                    const quic::ParsedQuicVersionVector& supported_versions,
+                   const quic::QuicConfig& config,
                    std::unique_ptr<quic::ProofVerifier> proof_verifier);
 
   ~QuicSimpleClient() override;
diff --git a/chromium/net/tools/quic/quic_simple_client_bin.cc b/chromium/net/tools/quic/quic_simple_client_bin.cc
index dae728bc0a0..1de449b8af6 100644
--- a/chromium/net/tools/quic/quic_simple_client_bin.cc
+++ b/chromium/net/tools/quic/quic_simple_client_bin.cc
@@ -61,6 +61,7 @@ class QuicSimpleClientFactory : public quic::QuicToyClient::ClientFactory {
       std::string host_for_lookup,
       uint16_t port,
       quic::ParsedQuicVersionVector versions,
+      const quic::QuicConfig& config,
       std::unique_ptr<quic::ProofVerifier> verifier) override {
     net::AddressList addresses;
     int rv = net::SynchronousHostResolver::Resolve(host_for_lookup, &addresses);
@@ -85,7 +86,7 @@ class QuicSimpleClientFactory : public quic::QuicToyClient::ClientFactory {
 
     quic::QuicServerId server_id(host_for_handshake, port, false);
     return std::make_unique<net::QuicSimpleClient>(
-        quic::QuicSocketAddress(ip_addr, port), server_id, versions,
+        quic::QuicSocketAddress(ip_addr, port), server_id, versions, config,
         std::move(verifier));
   }
 };
diff --git a/chromium/net/tools/quic/quic_simple_client_test.cc b/chromium/net/tools/quic/quic_simple_client_test.cc
index a36102e5ad9..b522460bcd3 100644
--- a/chromium/net/tools/quic/quic_simple_client_test.cc
+++ b/chromium/net/tools/quic/quic_simple_client_test.cc
@@ -19,7 +19,7 @@ TEST(QuicSimpleClientTest, Initialize) {
   quic::QuicServerId server_id("hostname", server_address.port(), false);
   quic::ParsedQuicVersionVector versions = quic::AllSupportedVersions();
   QuicSimpleClient client(
-      server_address, server_id, versions,
+      server_address, server_id, versions, quic::QuicConfig(),
       quic::test::crypto_test_utils::ProofVerifierForTesting());
   EXPECT_TRUE(client.Initialize());
 }
diff --git a/chromium/net/tools/quic/quic_simple_server.cc b/chromium/net/tools/quic/quic_simple_server.cc
index 9c397b57c98..01c3e63a084 100644
--- a/chromium/net/tools/quic/quic_simple_server.cc
+++ b/chromium/net/tools/quic/quic_simple_server.cc
@@ -125,6 +125,7 @@ bool QuicSimpleServer::Listen(const IPEndPoint& address) {
 }
 
 void QuicSimpleServer::Shutdown() {
+  LOG(WARNING) << "QuicSimpleServer is shutting down";
   // Before we shut down the epoll server, give all active sessions a chance to
   // notify clients that they're closing.
   dispatcher_->Shutdown();
@@ -177,20 +178,24 @@ void QuicSimpleServer::StartReading() {
 
 void QuicSimpleServer::OnReadComplete(int result) {
   read_pending_ = false;
-  if (result == 0)
-    result = ERR_CONNECTION_CLOSED;
 
-  if (result < 0) {
+  if (result > 0) {
+    quic::QuicReceivedPacket packet(read_buffer_->data(), result,
+                                    helper_->GetClock()->Now(), false);
+    dispatcher_->ProcessPacket(ToQuicSocketAddress(server_address_),
+                               ToQuicSocketAddress(client_address_), packet);
+  } else {
     LOG(ERROR) << "QuicSimpleServer read failed: " << ErrorToString(result);
-    Shutdown();
-    return;
+    // Do not act on ERR_MSG_TOO_BIG as that indicates that we received a UDP
+    // packet whose payload is larger than our receive buffer. Do not act on 0
+    // as that indicates that we received a UDP packet with an empty payload.
+    // In both cases, the socket should still be usable.
+    if (result != ERR_MSG_TOO_BIG && result != 0) {
+      Shutdown();
+      return;
+    }
   }
 
-  quic::QuicReceivedPacket packet(read_buffer_->data(), result,
-                                  helper_->GetClock()->Now(), false);
-  dispatcher_->ProcessPacket(ToQuicSocketAddress(server_address_),
-                             ToQuicSocketAddress(client_address_), packet);
-
   StartReading();
 }
 
diff --git a/chromium/net/tools/quic/quic_simple_server_packet_writer.cc b/chromium/net/tools/quic/quic_simple_server_packet_writer.cc
index b4599eba584..5978b7922a8 100644
--- a/chromium/net/tools/quic/quic_simple_server_packet_writer.cc
+++ b/chromium/net/tools/quic/quic_simple_server_packet_writer.cc
@@ -88,10 +88,10 @@ bool QuicSimpleServerPacketWriter::IsBatchMode() const {
   return false;
 }
 
-char* QuicSimpleServerPacketWriter::GetNextWriteLocation(
+quic::QuicPacketBuffer QuicSimpleServerPacketWriter::GetNextWriteLocation(
     const quic::QuicIpAddress& self_address,
     const quic::QuicSocketAddress& peer_address) {
-  return nullptr;
+  return {nullptr, nullptr};
 }
 
 quic::WriteResult QuicSimpleServerPacketWriter::Flush() {
diff --git a/chromium/net/tools/quic/quic_simple_server_packet_writer.h b/chromium/net/tools/quic/quic_simple_server_packet_writer.h
index 76f8b8e82f9..c8ba2227ba5 100644
--- a/chromium/net/tools/quic/quic_simple_server_packet_writer.h
+++ b/chromium/net/tools/quic/quic_simple_server_packet_writer.h
@@ -50,7 +50,7 @@ class QuicSimpleServerPacketWriter : public quic::QuicPacketWriter {
       const quic::QuicSocketAddress& peer_address) const override;
   bool SupportsReleaseTime() const override;
   bool IsBatchMode() const override;
-  char* GetNextWriteLocation(
+  quic::QuicPacketBuffer GetNextWriteLocation(
       const quic::QuicIpAddress& self_address,
       const quic::QuicSocketAddress& peer_address) override;
   quic::WriteResult Flush() override;