Roll src/net/third_party/quiche/src/ 7be3caccf..a0c8f5aa0 (3 commits)

https://quiche.googlesource.com/quiche.git/+log/7be3caccf..a0c8f5aa0

$ git log 7be3caccf..a0c8f5aa0 --date=short --no-merges --format='%ad %ae %s'
2019-08-04 bnc Add QpackEncoder::SetMaximumDynamicTableCapacity() and SetMaximumBlockedStreams() and call them when corresponding settings are received.
2019-08-02 dschinazi Fix coalesced packet processing
2019-08-02 renjietang Remove incorrect uses of GetHeadersStreamId().

Change-Id: I8d44ef3d884f4321050d795d376a3ed06be74d26
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1739290
Commit-Queue: Bence Béky <bnc@chromium.org>
Reviewed-by: Ryan Hamilton <rch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#684389}

DEPS

@@ -284,7 +284,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': '7be3caccf89cbc7bda2cc92037c6758739c2f835',
+  'quiche_revision': 'a0c8f5aa07e68b2fea7862c169d262c6331f04b2',
   # 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/BUILD.gn

@@ -3423,6 +3423,10 @@ source_set("quic_test_tools") {
     "third_party/quiche/src/quic/test_tools/mock_quic_spdy_client_stream.h",
     "third_party/quiche/src/quic/test_tools/mock_random.cc",
     "third_party/quiche/src/quic/test_tools/mock_random.h",
+    "third_party/quiche/src/quic/test_tools/qpack_encoder_peer.cc",
+    "third_party/quiche/src/quic/test_tools/qpack_encoder_peer.h",
+    "third_party/quiche/src/quic/test_tools/qpack_header_table_peer.cc",
+    "third_party/quiche/src/quic/test_tools/qpack_header_table_peer.h",
     "third_party/quiche/src/quic/test_tools/quic_buffered_packet_store_peer.cc",
     "third_party/quiche/src/quic/test_tools/quic_buffered_packet_store_peer.h",
     "third_party/quiche/src/quic/test_tools/quic_client_promised_info_peer.cc",

net/quic/quic_test_packet_maker.cc

@@ -137,8 +137,6 @@ QuicTestPacketMaker::QuicTestPacketMaker(
       client_headers_include_h2_stream_dependency_(
           client_headers_include_h2_stream_dependency &&
           version.transport_version >= quic::QUIC_VERSION_43) {
-  stream_offsets_[quic::QuicUtils::GetHeadersStreamId(
-      version_.transport_version)] = 0;
   DCHECK(!(perspective_ == quic::Perspective::IS_SERVER &&
            client_headers_include_h2_stream_dependency_));
 }
@@ -407,7 +405,7 @@ QuicTestPacketMaker::MakeRstAndRequestHeadersPacket(
     *spdy_headers_frame_length = spdy_frame.size();
   }
   quic::QuicStreamFrame headers_frame = GenerateNextStreamFrame(
-      quic::QuicUtils::GetHeadersStreamId(version_.transport_version), false,
+      GetHeadersStreamId(), false,
       quic::QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
   frames.push_back(quic::QuicFrame(headers_frame));
 
@@ -685,17 +683,6 @@ std::unique_ptr<quic::QuicReceivedPacket> QuicTestPacketMaker::MakeAckPacket(
   return encrypted.Clone();
 }
 
-std::unique_ptr<quic::QuicReceivedPacket>
-QuicTestPacketMaker::MakeHeadersDataPacket(uint64_t packet_number,
-                                           bool should_include_version,
-                                           bool fin,
-                                           quic::QuicStringPiece data) {
-  return MakeDataPacket(
-      packet_number,
-      quic::QuicUtils::GetHeadersStreamId(version_.transport_version),
-      should_include_version, fin, data);
-}
-
 std::unique_ptr<quic::QuicReceivedPacket> QuicTestPacketMaker::MakeDataPacket(
     uint64_t packet_number,
     quic::QuicStreamId stream_id,
@@ -869,7 +856,7 @@ QuicTestPacketMaker::MakeRequestHeadersAndMultipleDataFramesPacket(
     *spdy_headers_frame_length = spdy_frame.size();
   }
   quic::QuicStreamFrame frame = GenerateNextStreamFrame(
-      quic::QuicUtils::GetHeadersStreamId(version_.transport_version), false,
+      GetHeadersStreamId(), false,
       quic::QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
   quic::QuicFrames frames;
   frames.push_back(quic::QuicFrame(frame));
@@ -954,7 +941,7 @@ QuicTestPacketMaker::MakeRequestHeadersPacket(
     *spdy_headers_frame_length = spdy_frame.size();
 
   quic::QuicStreamFrame frame = GenerateNextStreamFrame(
-      quic::QuicUtils::GetHeadersStreamId(version_.transport_version), false,
+      GetHeadersStreamId(), false,
       quic::QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
   return MakePacket(header_, quic::QuicFrame(frame));
 }
@@ -1035,7 +1022,7 @@ QuicTestPacketMaker::MakeRequestHeadersAndRstPacket(
     *spdy_headers_frame_length = spdy_frame.size();
   }
   quic::QuicStreamFrame headers_frame = GenerateNextStreamFrame(
-      quic::QuicUtils::GetHeadersStreamId(version_.transport_version), false,
+      GetHeadersStreamId(), false,
       quic::QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
 
   quic::QuicRstStreamFrame rst_frame(1, stream_id, error_code,
@@ -1120,7 +1107,7 @@ QuicTestPacketMaker::MakePushPromisePacket(
     *spdy_headers_frame_length = spdy_frame.size();
   }
   quic::QuicStreamFrame frame = GenerateNextStreamFrame(
-      quic::QuicUtils::GetHeadersStreamId(version_.transport_version), false,
+      GetHeadersStreamId(), false,
       quic::QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
   return MakePacket(header_, quic::QuicFrame(frame));
 }
@@ -1138,8 +1125,8 @@ QuicTestPacketMaker::MakeForceHolDataPacket(uint64_t packet_number,
       spdy_request_framer_.SerializeFrame(spdy_data));
   InitializeHeader(packet_number, should_include_version);
   quic::QuicStreamFrame quic_frame(
-      quic::QuicUtils::GetHeadersStreamId(version_.transport_version), false,
-      *offset, quic::QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
+      GetHeadersStreamId(), false, *offset,
+      quic::QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
   *offset += spdy_frame.size();
   return MakePacket(header_, quic::QuicFrame(quic_frame));
 }
@@ -1178,7 +1165,7 @@ QuicTestPacketMaker::MakeResponseHeadersPacket(
     *spdy_headers_frame_length = spdy_frame.size();
   }
   quic::QuicStreamFrame frame = GenerateNextStreamFrame(
-      quic::QuicUtils::GetHeadersStreamId(version_.transport_version), false,
+      GetHeadersStreamId(), false,
       quic::QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
   return MakePacket(header_, quic::QuicFrame(frame));
 }
@@ -1313,7 +1300,7 @@ QuicTestPacketMaker::MakeSettingsPacket(uint64_t packet_number,
         spdy_request_framer_.SerializeFrame(settings_frame));
     InitializeHeader(packet_number, should_include_version);
     quic::QuicStreamFrame quic_frame = GenerateNextStreamFrame(
-        quic::QuicUtils::GetHeadersStreamId(version_.transport_version), false,
+        GetHeadersStreamId(), false,
         quic::QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
     return MakePacket(header_, quic::QuicFrame(quic_frame));
   }
@@ -1358,7 +1345,7 @@ QuicTestPacketMaker::MakeInitialSettingsPacket(uint64_t packet_number) {
         spdy_request_framer_.SerializeFrame(settings_frame));
     InitializeHeader(packet_number, /*should_include_version*/ true);
     quic::QuicStreamFrame quic_frame = GenerateNextStreamFrame(
-        quic::QuicUtils::GetHeadersStreamId(version_.transport_version), false,
+        GetHeadersStreamId(), false,
         quic::QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
     return MakePacket(header_, quic::QuicFrame(quic_frame));
   }
@@ -1414,7 +1401,7 @@ QuicTestPacketMaker::MakePriorityPacket(uint64_t packet_number,
         spdy_request_framer_.SerializeFrame(priority_frame));
 
     quic::QuicStreamFrame quic_frame = GenerateNextStreamFrame(
-        quic::QuicUtils::GetHeadersStreamId(version_.transport_version), false,
+        GetHeadersStreamId(), false,
         quic::QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
     InitializeHeader(packet_number, should_include_version);
     return MakePacket(header_, quic::QuicFrame(quic_frame));
@@ -1475,8 +1462,10 @@ QuicTestPacketMaker::MakeAckAndMultiplePriorityFramesPacket(
 
     spdy::SpdySerializedFrame* spdy_frame = spdy_frames.back().get();
     quic::QuicStreamFrame stream_frame = GenerateNextStreamFrame(
-        quic::QuicUtils::GetHeadersStreamId(version_.transport_version), false,
-        quic::QuicStringPiece(spdy_frame->data(), spdy_frame->size()));
+        quic::VersionUsesQpack(version_.transport_version)
+            ? GetFirstBidirectionalStreamId()
+            : GetHeadersStreamId(),
+        false, quic::QuicStringPiece(spdy_frame->data(), spdy_frame->size()));
 
     frames.push_back(quic::QuicFrame(stream_frame));
   }
@@ -1659,5 +1648,14 @@ void QuicTestPacketMaker::Reset() {
     stream_offsets_[kv.first] = 0;
 }
 
+quic::QuicStreamId QuicTestPacketMaker::GetFirstBidirectionalStreamId() const {
+  return quic::QuicUtils::GetFirstBidirectionalStreamId(
+      version_.transport_version, perspective_);
+}
+
+quic::QuicStreamId QuicTestPacketMaker::GetHeadersStreamId() const {
+  return quic::QuicUtils::GetHeadersStreamId(version_.transport_version);
+}
+
 }  // namespace test
 }  // namespace net

net/quic/quic_test_packet_maker.h

@@ -186,11 +186,6 @@ class QuicTestPacketMaker {
       bool should_include_version,
       bool fin,
       quic::QuicStringPiece data);
-  std::unique_ptr<quic::QuicReceivedPacket> MakeHeadersDataPacket(
-      uint64_t packet_number,
-      bool should_include_version,
-      bool fin,
-      quic::QuicStringPiece data);
   std::unique_ptr<quic::QuicReceivedPacket> MakeForceHolDataPacket(
       uint64_t packet_number,
       quic::QuicStreamId stream_id,
@@ -400,6 +395,9 @@ class QuicTestPacketMaker {
   quic::QuicConnectionIdIncluded HasDestinationConnectionId() const;
   quic::QuicConnectionIdIncluded HasSourceConnectionId() const;
 
+  quic::QuicStreamId GetFirstBidirectionalStreamId() const;
+  quic::QuicStreamId GetHeadersStreamId() const;
+
   quic::ParsedQuicVersion version_;
   quic::QuicConnectionId connection_id_;
   quic::MockClock* clock_;  // Owned by QuicStreamFactory.