Split out QuicAlarm creation from QuicConnectionHelper to new QuicAlarmFactory.

net/tools/quic/quic_client_base.h

Index: net/tools/quic/quic_client_base.h
diff --git a/net/tools/quic/quic_client_base.h b/net/tools/quic/quic_client_base.h
index af44bdaca19ffc624c585d606180c35b7259ad6f..0c0da3592c48635f2f8ed1eb9cb888a9f50feec1 100644
--- a/net/tools/quic/quic_client_base.h
+++ b/net/tools/quic/quic_client_base.h
@@ -36,6 +36,7 @@ class QuicClientBase {
                  const QuicVersionVector& supported_versions,
                  const QuicConfig& config,
                  QuicConnectionHelperInterface* helper,
+                 QuicAlarmFactory* alarm_factory,
                  ProofVerifier* proof_verifier);
 
   ~QuicClientBase();
@@ -181,6 +182,8 @@ class QuicClientBase {
 
   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;
   }
@@ -201,6 +204,9 @@ class QuicClientBase {
   // 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_;