Roll src/net/third_party/quiche/src/ 1a5d09ce1..8212c4592 (4 commits)

https://quiche.googlesource.com/quiche.git/+log/1a5d09ce1b89..8212c45924e3

$ git log 1a5d09ce1..8212c4592 --date=short --no-merges --format='%ad %ae %s'
2020-06-05 renjietang Remove Mocking of QuicSession::OnZeroRttRejected() because the implementation is now available.
2020-06-05 vasilvv Rename QuicheNullOpt to QUICHE_NULLOPT
2020-06-05 fayang Automated g4 rollback of changelist 314796960.
2020-06-05 nharper Remove no-op code in tlsserverhandshaker, not flag protected

Created with:
  roll-dep src/net/third_party/quiche/src src/third_party/quic_trace/src

update flags

R=dschinazi@chromium.org

Change-Id: I0c01638f846841bacf25c42e00eaccb3ad7dc6cf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2232771
Commit-Queue: Dan Zhang <danzh@chromium.org>
Auto-Submit: Dan Zhang <danzh@chromium.org>
Reviewed-by: David Schinazi <dschinazi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#776083}

DEPS

@@ -309,7 +309,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
-  'quiche_revision': '1a5d09ce1b898b4a7a694f5ae99a9a9a31bd34f3',
+  'quiche_revision': '8212c45924e356cea0bc43acde1826aafa11e493',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ios_webkit
   # and whatever else without interference from each other.

net/quic/quic_chromium_client_session_test.cc

@@ -1752,7 +1752,7 @@ TEST_P(QuicChromiumClientSessionTest, MigrateToSocket) {
   quic::test::QuicStreamPeer::SendBuffer(stream).SaveStreamData(iov, 1, 0, 4);
   quic::test::QuicStreamPeer::SetStreamBytesWritten(4, stream);
   session_->WritevData(stream->id(), 4, 0, quic::NO_FIN,
-                       quic::NOT_RETRANSMISSION, QuicheNullOpt);
+                       quic::NOT_RETRANSMISSION, QUICHE_NULLOPT);
 
   EXPECT_TRUE(socket_data.AllReadDataConsumed());
   EXPECT_TRUE(socket_data.AllWriteDataConsumed());

net/quic/quic_flags_list.h

@@ -292,13 +292,6 @@ QUIC_FLAG(bool,
 // If true, server push will be allowed in QUIC versions using HTTP/3.
 QUIC_FLAG(bool, FLAGS_quic_enable_http3_server_push, false)
 
-// If true, disable QuicDispatcher workaround that replies to invalid QUIC
-// packets from the Android Conformance Test.
-QUIC_FLAG(
-    bool,
-    FLAGS_quic_reloadable_flag_quic_remove_android_conformance_test_workaround,
-    true)
-
 // The divisor that controls how often MAX_STREAMS frames are sent.
 QUIC_FLAG(int32_t, FLAGS_quic_max_streams_window_divisor, 2)
 
@@ -315,27 +308,12 @@ QUIC_FLAG(bool,
           FLAGS_quic_reloadable_flag_quic_bbr2_fewer_startup_round_trips,
           false)
 
-// If true, remove draining_streams_ from QuicSession.
-QUIC_FLAG(bool,
-          FLAGS_quic_reloadable_flag_quic_deprecate_draining_streams,
-          true)
-
-// If true, break session/stream close loop.
-QUIC_FLAG(bool,
-          FLAGS_quic_reloadable_flag_quic_break_session_stream_close_loop,
-          true)
-
 // Replace the usage of ConnectionData::encryption_level in
 // quic_time_wait_list_manager with a new TimeWaitAction.
 QUIC_FLAG(bool,
           FLAGS_quic_restart_flag_quic_replace_time_wait_list_encryption_level,
           true)
 
-// If true, move Goolge QUIC stream accounting to LegacyQuicStreamIdManager.
-QUIC_FLAG(bool,
-          FLAGS_quic_reloadable_flag_quic_stream_id_manager_handles_accounting,
-          true)
-
 // If true, enables support for TLS resumption in QUIC.
 QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_enable_tls_resumption, false)
 
@@ -388,13 +366,6 @@ QUIC_FLAG(bool,
           FLAGS_quic_restart_flag_quic_google_transport_param_send_new,
           true)
 
-// If true, if a buffered MTU packet causes a write to return MSG_TOO_BIG, this
-// error will be ignored.
-QUIC_FLAG(
-    bool,
-    FLAGS_quic_reloadable_flag_quic_ignore_msg_too_big_from_buffered_packets,
-    true)
-
 // If true, check ShouldGeneratePacket for every crypto packet.
 QUIC_FLAG(bool,
           FLAGS_quic_reloadable_flag_quic_fix_checking_should_generate_packet,

net/quiche/common/platform/impl/quiche_optional_impl.h

@@ -12,7 +12,7 @@ namespace quiche {
 template <typename T>
 using QuicheOptionalImpl = base::Optional<T>;
 
-#define QuicheNullOptImpl base::nullopt
+#define QUICHE_NULLOPT_IMPL base::nullopt
 
 }  // namespace quiche
 

third_party/blink/renderer/modules/peerconnection/adapters/p2p_quic_stream_unittest.cc

@@ -90,7 +90,7 @@ TEST_F(P2PQuicStreamTest, StreamSendsFinAndCanNoLongerWrite) {
       .WillOnce(InvokeWithoutArgs([this]() {
         return session_->ConsumeData(stream_->id(), 0u, 0u,
                                      quic::StreamSendingState::FIN,
-                                     quic::NOT_RETRANSMISSION, QuicheNullOpt);
+                                     quic::NOT_RETRANSMISSION, QUICHE_NULLOPT);
       }));
 
   stream_->WriteData({}, /*fin=*/true);
@@ -129,7 +129,7 @@ TEST_F(P2PQuicStreamTest, StreamClosedAfterSendingThenReceivingFin) {
       .WillOnce(InvokeWithoutArgs([this]() {
         return session_->ConsumeData(stream_->id(), 0u, 0u,
                                      quic::StreamSendingState::FIN,
-                                     quic::NOT_RETRANSMISSION, QuicheNullOpt);
+                                     quic::NOT_RETRANSMISSION, QUICHE_NULLOPT);
       }));
 
   stream_->WriteData({}, /*fin=*/true);
@@ -157,7 +157,7 @@ TEST_F(P2PQuicStreamTest, StreamClosedAfterReceivingThenSendingFin) {
       .WillOnce(InvokeWithoutArgs([this]() {
         return session_->ConsumeData(stream_->id(), 0u, 0u,
                                      quic::StreamSendingState::FIN,
-                                     quic::NOT_RETRANSMISSION, QuicheNullOpt);
+                                     quic::NOT_RETRANSMISSION, QUICHE_NULLOPT);
       }));
 
   stream_->WriteData({}, /*fin=*/true);