Split out QuicAlarm creation from QuicConnectionHelper to new QuicAlarmFactory.

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 18 matching lines @@
 
 class ProofVerifier;
 class QuicServerId;
 
 class QuicClientBase {
  public:
   QuicClientBase(const QuicServerId& server_id,
                  const QuicVersionVector& supported_versions,
                  const QuicConfig& config,
                  QuicConnectionHelperInterface* helper,
+                 QuicAlarmFactory* alarm_factory,
                  ProofVerifier* proof_verifier);
 
   ~QuicClientBase();
 
   // 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.
@@ skipping 125 matching lines @@
   // 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();
 
   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:
   // |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_|.
   scoped_ptr<QuicConnectionHelperInterface> helper_;
 
+  // Alarm factory used for alarm creation.  Needs to outlive |session_|.
+  scoped_ptr<QuicAlarmFactory> alarm_factory_;

[Ryan Hamilton, 2016/04/18 22:10:54]

nit:unique_ptr

+
   // Writer used to actually send packets to the wire. Needs to outlive
   // |session_|.
   scoped_ptr<QuicPacketWriter> writer_;
 
   // Session which manages streams.
   scoped_ptr<QuicClientSession> session_;
 
   // This vector contains QUIC versions which we currently support.
   // This should be ordered such that the highest supported version is the first
   // element, with subsequent elements in descending order (versions can be
@@ skipping 27 matching lines @@
   bool connected_or_attempting_connect_;
 
   QuicClientPushPromiseIndex push_promise_index_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicClientBase);
 };
 
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_CLIENT_BASE_H_