Move QuicClient::ClientQuicDataToResend from QuicClient to QuicClientBase.

net/tools/quic/quic_simple_client.h

Index: net/tools/quic/quic_simple_client.h
diff --git a/net/tools/quic/quic_simple_client.h b/net/tools/quic/quic_simple_client.h
index c58fdeb734501d6b033d52a514cf4114b9c43345..ff64c3f5666255aa46b9253f61543c212e8b83de 100644
--- a/net/tools/quic/quic_simple_client.h
+++ b/net/tools/quic/quic_simple_client.h
@@ -38,7 +38,6 @@ class QuicClientPeer;
 }  // namespace test
 
 class QuicSimpleClient : public QuicClientBase,
-                         public QuicSpdyStream::Visitor,
                          public QuicChromiumPacketReader::Visitor {
  public:
   class ResponseListener {
@@ -84,7 +83,7 @@ class QuicSimpleClient : public QuicClientBase,
   // Sends an HTTP request and does not wait for response before returning.
   void SendRequest(const SpdyHeaderBlock& headers,
                    base::StringPiece body,
-                   bool fin);
+                   bool fin) override;
 
   // Sends an HTTP request and waits for response before returning.
   void SendRequestAndWaitForResponse(const SpdyHeaderBlock& headers,
@@ -108,12 +107,6 @@ class QuicSimpleClient : public QuicClientBase,
   // QuicSpdyStream::Visitor
   void OnClose(QuicSpdyStream* stream) override;
 
-  // If the crypto handshake has not yet been confirmed, adds the data to the
-  // queue of data to resend if the client receives a stateless reject.
-  // Otherwise, deletes the data.
-  void MaybeAddQuicDataToResend(
-      std::unique_ptr<QuicDataToResend> data_to_resend);
-
   void set_bind_to_address(const IPAddress& address) {
     bind_to_address_ = address;
   }
@@ -145,28 +138,6 @@ class QuicSimpleClient : public QuicClientBase,
  private:
   friend class net::test::QuicClientPeer;
 
-  // Specific QuicClient class for storing data to resend.
-  class ClientQuicDataToResend : public QuicDataToResend {
-   public:
-    // Takes ownership of |headers|.
-    ClientQuicDataToResend(std::unique_ptr<SpdyHeaderBlock> headers,
-                           base::StringPiece body,
-                           bool fin,
-                           QuicSimpleClient* client)
-        : QuicDataToResend(std::move(headers), body, fin), client_(client) {
-      DCHECK(client);
-    }
-
-    ~ClientQuicDataToResend() override {}
-
-    void Resend() override;
-
-   private:
-    QuicSimpleClient* client_;
-
-    DISALLOW_COPY_AND_ASSIGN(ClientQuicDataToResend);
-  };
-
   // Used during initialization: creates the UDP socket FD, sets socket options,
   // and binds the socket to our address.
   bool CreateUDPSocket();
@@ -217,10 +188,6 @@ class QuicSimpleClient : public QuicClientBase,
   // Body of most recent response.
   std::string latest_response_body_;
 
-  // Keeps track of any data that must be resent upon a subsequent successful
-  // connection, in case the client receives a stateless reject.
-  std::vector<std::unique_ptr<QuicDataToResend>> data_to_resend_on_connect_;
-
   // The log used for the sockets.
   NetLog net_log_;