Refactor QuicClientSession so that it owns the underlying socket

net/quic/quic_client_session.h

Index: net/quic/quic_client_session.h
diff --git a/net/quic/quic_client_session.h b/net/quic/quic_client_session.h
index 85c3413441278aa174b6a329e42910d1af22e062..cdb2e9031adffa7a1963a5af654e8473ca8d0094 100644
--- a/net/quic/quic_client_session.h
+++ b/net/quic/quic_client_session.h
@@ -21,6 +21,7 @@
 
 namespace net {
 
+class DatagramClientSocket;
 class QuicConnectionHelper;
 class QuicStreamFactory;
 
@@ -30,7 +31,7 @@ class NET_EXPORT_PRIVATE QuicClientSession : public QuicSession {
   // not |stream_factory|, which must outlive this session.
   // TODO(rch): decouple the factory from the session via a Delegate interface.
   QuicClientSession(QuicConnection* connection,
-                    QuicConnectionHelper* helper,
+                    DatagramClientSocket* socket,
                     QuicStreamFactory* stream_factory,
                     const std::string& server_hostname,
                     NetLog* net_log);
@@ -68,8 +69,8 @@ class NET_EXPORT_PRIVATE QuicClientSession : public QuicSession {
 
   base::WeakPtrFactory<QuicClientSession> weak_factory_;
   QuicCryptoClientStream crypto_stream_;
-  scoped_ptr<QuicConnectionHelper> helper_;
   QuicStreamFactory* stream_factory_;
+  scoped_ptr<DatagramClientSocket> socket_;
   scoped_refptr<IOBufferWithSize> read_buffer_;
   bool read_pending_;
   CompletionCallback callback_;