Move QuicClient::ClientQuicDataToResend from QuicClient to QuicClientBase.

net/tools/quic/quic_client_base.h

 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // A base class for the toy client, which connects to a specified port and sends
 // QUIC request to that endpoint.
 
 #ifndef NET_TOOLS_QUIC_QUIC_CLIENT_BASE_H_
 #define NET_TOOLS_QUIC_QUIC_CLIENT_BASE_H_
 
@@ skipping 13 matching lines @@
 #include "net/quic/core/quic_packet_writer.h"
 #include "net/quic/core/quic_protocol.h"
 #include "net/tools/quic/quic_client_session.h"
 #include "net/tools/quic/quic_spdy_client_stream.h"
 
 namespace net {
 
 class ProofVerifier;
 class QuicServerId;
 
-class QuicClientBase {
+class QuicClientBase : public QuicClientPushPromiseIndex::Delegate,
+                       public QuicSpdyStream::Visitor {
  public:
   // The client uses these objects to keep track of any data to resend upon
   // receipt of a stateless reject.  Recall that the client API allows callers
   // to optimistically send data to the server prior to handshake-confirmation.
   // If the client subsequently receives a stateless reject, it must tear down
   // its existing session, create a new session, and resend all previously sent
   // data.  It uses these objects to keep track of all the sent data, and to
   // resend the data upon a subsequent connection.
   class QuicDataToResend {
    public:
@@ skipping 17 matching lines @@
     DISALLOW_COPY_AND_ASSIGN(QuicDataToResend);
   };
 
   QuicClientBase(const QuicServerId& server_id,
                  const QuicVersionVector& supported_versions,
                  const QuicConfig& config,
                  QuicConnectionHelperInterface* helper,
                  QuicAlarmFactory* alarm_factory,
                  std::unique_ptr<ProofVerifier> proof_verifier);
 
-  ~QuicClientBase();
+  ~QuicClientBase() override;

[Zhongyi Shi, 2016/09/27 04:40:25]

Why this need to be overridden? I thought it should be a virtual destructor for
the base class. 

[Ryan Hamilton, 2016/09/27 14:28:00]

Because QuicClientBase is no longer just a base class. It now extends two
others, and chromium compilers complain otherwise.

[Zhongyi Shi, 2016/09/27 17:06:57]

Acknowledged.

 
   // Initializes the client to create a connection. Should be called exactly
   // once before calling StartConnect or Connect. Returns true if the
   // initialization succeeds, false otherwise.
   virtual bool Initialize();
 
   // Returns true if the crypto handshake has yet to establish encryption.
   // Returns false if encryption is active (even if the server hasn't confirmed
   // the handshake) or if the connection has been closed.
   bool EncryptionBeingEstablished();
 
   // Returns a newly created QuicSpdyClientStream, owned by the
   // QuicSimpleClient.
   virtual QuicSpdyClientStream* CreateReliableClientStream();
 
   // Wait for events until the stream with the given ID is closed.
   void WaitForStreamToClose(QuicStreamId id);
 
   // Wait for events until the handshake is confirmed.
   void WaitForCryptoHandshakeConfirmed();
 
+  // Sends an HTTP request and does not wait for response before returning.
+  virtual void SendRequest(const SpdyHeaderBlock& headers,
+                           base::StringPiece body,
+                           bool fin) = 0;
+
   // Wait up to 50ms, and handle any events which occur.
   // Returns true if there are any outstanding requests.
   virtual bool WaitForEvents() = 0;
 
   QuicClientSession* session() { return session_.get(); }
 
   bool connected() const;
   bool goaway_received() const;
 
   const QuicServerId& server_id() const { return server_id_; }
@@ skipping 93 matching lines @@
   }
 
   ProofVerifier* proof_verifier() const;
 
   void set_session(QuicClientSession* session) { session_.reset(session); }
 
   QuicClientPushPromiseIndex* push_promise_index() {
     return &push_promise_index_;
   }
 
+  bool CheckVary(const SpdyHeaderBlock& client_request,
+                 const SpdyHeaderBlock& promise_request,
+                 const SpdyHeaderBlock& promise_response) override;
+  void OnRendezvousResult(QuicSpdyStream*) 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);
+
  protected:
   // Takes ownership of |connection|.
   virtual QuicClientSession* CreateQuicClientSession(
       QuicConnection* connection);
 
   // Generates the next ConnectionId for |server_id_|.  By default, if the
   // cached server config contains a server-designated ID, that ID will be
   // returned.  Otherwise, the next random ID will be returned.
   QuicConnectionId GetNextConnectionId();
 
   // Returns the next server-designated ConnectionId from the cached config for
   // |server_id_|, if it exists.  Otherwise, returns 0.
   QuicConnectionId GetNextServerDesignatedConnectionId();
 
   // Generates a new, random connection ID (as opposed to a server-designated
   // connection ID).
   virtual QuicConnectionId GenerateNewConnectionId();
 
+  // 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 MaybeAddDataToResend(const SpdyHeaderBlock& headers,
+                            base::StringPiece body,
+                            bool fin);
+
+  void ClearDataToResend();
+
+  void ResendSavedData();
+
+  void AddPromiseDataToResend(const SpdyHeaderBlock& headers,
+                              base::StringPiece body,
+                              bool fin);
+
   QuicConnectionHelperInterface* helper() { return helper_.get(); }
 
   QuicAlarmFactory* alarm_factory() { return alarm_factory_.get(); }
 
   void set_num_sent_client_hellos(int num_sent_client_hellos) {
     num_sent_client_hellos_ = num_sent_client_hellos;
   }
 
   void set_num_stateless_rejects_received(int num_stateless_rejects_received) {
     num_stateless_rejects_received_ = num_stateless_rejects_received;
   }
 
  private:
+  // Specific QuicClient class for storing data to resend.
+  class ClientQuicDataToResend : public QuicDataToResend {
+   public:
+    ClientQuicDataToResend(std::unique_ptr<SpdyHeaderBlock> headers,
+                           base::StringPiece body,
+                           bool fin,
+                           QuicClientBase* client)
+        : QuicDataToResend(std::move(headers), body, fin), client_(client) {
+      DCHECK(headers_);
+      DCHECK(client);
+    }
+
+    ~ClientQuicDataToResend() override {}
+
+    void Resend() override;
+
+   private:
+    QuicClientBase* client_;
+
+    DISALLOW_COPY_AND_ASSIGN(ClientQuicDataToResend);
+  };
+
   // |server_id_| is a tuple (hostname, port, is_https) of the server.
   QuicServerId server_id_;
 
   // config_ and crypto_config_ contain configuration and cached state about
   // servers.
   QuicConfig config_;
   QuicCryptoClientConfig crypto_config_;
 
   // Helper to be used by created connections. Needs to outlive |session_|.
   std::unique_ptr<QuicConnectionHelperInterface> helper_;
@@ skipping 35 matching lines @@
 
   // True when the client is attempting to connect or re-connect the session (in
   // the case of a stateless reject).  Set to false  between a call to
   // Disconnect() and the subsequent call to StartConnect().  When
   // connected_or_attempting_connect_ is false, the session object corresponds
   // to the previous client-level connection.
   bool connected_or_attempting_connect_;
 
   QuicClientPushPromiseIndex push_promise_index_;
 
+  // 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_;
+
+  std::unique_ptr<ClientQuicDataToResend> push_promise_data_to_resend_;
+
   DISALLOW_COPY_AND_ASSIGN(QuicClientBase);
 };
 
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_CLIENT_BASE_H_