QuicTestPacketMaker small improvements.

Use NoopDecoderStreamErrorDelegate and NoopQpackStreamSenderDelegate
implementations from test_tools instead of defining new ones.  There is
no need to crash on decoder stream errors or encoder stream data,
because |qpack_encoder_| is set up not to use the dynamic table and no
decoder stream data is fed to it.

Also add const qualifier to four methods.

Change-Id: Ibd103f3598458f2369e4ff7ce37b3855bfeabfef
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1986259
Auto-Submit: Bence Béky <bnc@chromium.org>
Reviewed-by: Zhongyi Shi <zhongyi@chromium.org>
Commit-Queue: Bence Béky <bnc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728282}

net/quic/quic_test_packet_maker.cc

@@ -107,16 +107,6 @@ quic::QuicFrames CloneFrames(const quic::QuicFrames& frames) {
 
 }  // namespace
 
-void QuicTestPacketMaker::DecoderStreamErrorDelegate::OnDecoderStreamError(
-    quiche::QuicheStringPiece error_message) {
-  LOG(FATAL) << error_message;
-}
-
-void QuicTestPacketMaker::EncoderStreamSenderDelegate::WriteStreamData(
-    quiche::QuicheStringPiece data) {
-  LOG(FATAL) << "data.length: " << data.length();
-}
-
 QuicTestPacketMaker::QuicTestPacketMaker(
     quic::ParsedQuicVersion version,
     quic::QuicConnectionId connection_id,
@@ -1105,7 +1095,7 @@ QuicTestPacketMaker::MakeResponseHeadersPacket(
 spdy::SpdyHeaderBlock QuicTestPacketMaker::GetRequestHeaders(
     const std::string& method,
     const std::string& scheme,
-    const std::string& path) {
+    const std::string& path) const {
   spdy::SpdyHeaderBlock headers;
   headers[":method"] = method;
   headers[":authority"] = host_;
@@ -1115,7 +1105,7 @@ spdy::SpdyHeaderBlock QuicTestPacketMaker::GetRequestHeaders(
 }
 
 spdy::SpdyHeaderBlock QuicTestPacketMaker::ConnectRequestHeaders(
-    const std::string& host_port) {
+    const std::string& host_port) const {
   spdy::SpdyHeaderBlock headers;
   headers[":method"] = "CONNECT";
   headers[":authority"] = host_port;
@@ -1123,7 +1113,7 @@ spdy::SpdyHeaderBlock QuicTestPacketMaker::ConnectRequestHeaders(
 }
 
 spdy::SpdyHeaderBlock QuicTestPacketMaker::GetResponseHeaders(
-    const std::string& status) {
+    const std::string& status) const {
   spdy::SpdyHeaderBlock headers;
   headers[":status"] = status;
   headers["content-type"] = "text/plain";
@@ -1132,7 +1122,7 @@ spdy::SpdyHeaderBlock QuicTestPacketMaker::GetResponseHeaders(
 
 spdy::SpdyHeaderBlock QuicTestPacketMaker::GetResponseHeaders(
     const std::string& status,
-    const std::string& alt_svc) {
+    const std::string& alt_svc) const {
   spdy::SpdyHeaderBlock headers;
   headers[":status"] = status;
   headers["alt-svc"] = alt_svc;

net/quic/quic_test_packet_maker.h

@@ -23,6 +23,8 @@
 #include "net/third_party/quiche/src/quic/core/quic_utils.h"
 #include "net/third_party/quiche/src/quic/platform/api/quic_clock.h"
 #include "net/third_party/quiche/src/quic/test_tools/mock_random.h"
+#include "net/third_party/quiche/src/quic/test_tools/qpack/qpack_encoder_test_utils.h"
+#include "net/third_party/quiche/src/quic/test_tools/qpack/qpack_test_utils.h"
 #include "net/third_party/quiche/src/spdy/core/spdy_framer.h"
 #include "net/third_party/quiche/src/spdy/core/spdy_protocol.h"
 
@@ -311,14 +313,15 @@ class QuicTestPacketMaker {
 
   spdy::SpdyHeaderBlock GetRequestHeaders(const std::string& method,
                                           const std::string& scheme,
-                                          const std::string& path);
+                                          const std::string& path) const;
 
-  spdy::SpdyHeaderBlock ConnectRequestHeaders(const std::string& host_port);
+  spdy::SpdyHeaderBlock ConnectRequestHeaders(
+      const std::string& host_port) const;
 
-  spdy::SpdyHeaderBlock GetResponseHeaders(const std::string& status);
+  spdy::SpdyHeaderBlock GetResponseHeaders(const std::string& status) const;
 
   spdy::SpdyHeaderBlock GetResponseHeaders(const std::string& status,
-                                           const std::string& alt_svc);
+                                           const std::string& alt_svc) const;
 
   spdy::SpdyFramer* spdy_request_framer() { return &spdy_request_framer_; }
   spdy::SpdyFramer* spdy_response_framer() { return &spdy_response_framer_; }
@@ -338,23 +341,6 @@ class QuicTestPacketMaker {
                                  size_t* encoded_data_length);
 
  private:
-  // QpackEncoder::DecoderStreamErrorDelegate implementation that does nothing
-  class DecoderStreamErrorDelegate
-      : public quic::QpackEncoder::DecoderStreamErrorDelegate {
-   public:
-    ~DecoderStreamErrorDelegate() override = default;
-
-    void OnDecoderStreamError(quiche::QuicheStringPiece error_message) override;
-  };
-
-  // QpackEncoderStreamSender::Delegate implementation that does nothing.
-  class EncoderStreamSenderDelegate : public quic::QpackStreamSenderDelegate {
-   public:
-    ~EncoderStreamSenderDelegate() override = default;
-
-    void WriteStreamData(quiche::QuicheStringPiece data) override;
-  };
-
   std::unique_ptr<quic::QuicReceivedPacket> MakePacket(
       const quic::QuicPacketHeader& header,
       const quic::QuicFrame& frame);
@@ -414,8 +400,8 @@ class QuicTestPacketMaker {
   spdy::SpdyFramer spdy_request_framer_;
   spdy::SpdyFramer spdy_response_framer_;
   bool save_packet_frames_;
-  DecoderStreamErrorDelegate decoder_stream_error_delegate_;
-  EncoderStreamSenderDelegate encoder_stream_sender_delegate_;
+  quic::test::NoopDecoderStreamErrorDelegate decoder_stream_error_delegate_;
+  quic::test::NoopQpackStreamSenderDelegate encoder_stream_sender_delegate_;
   quic::QpackEncoder qpack_encoder_;
   quic::test::MockRandom random_generator_;
   std::map<quic::QuicStreamId, quic::QuicStreamOffset> stream_offsets_;