Moving the work currently done in the QuicSession constructor to

net/quic/quic_client_session.cc

 // Copyright (c) 2012 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.
 
 #include "net/quic/quic_client_session.h"
 
 #include "base/callback_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
@@ skipping 114 matching lines @@
   session_.reset();
   *stream_ = stream;
   ResetAndReturn(&callback_).Run(OK);
 }
 
 void QuicClientSession::StreamRequest::OnRequestCompleteFailure(int rv) {
   session_.reset();
   ResetAndReturn(&callback_).Run(rv);
 }
 
-QuicClientSession::QuicClientSession(
-    QuicConnection* connection,
-    scoped_ptr<DatagramClientSocket> socket,
-    scoped_ptr<QuicDefaultPacketWriter> writer,
-    QuicStreamFactory* stream_factory,
-    QuicCryptoClientStreamFactory* crypto_client_stream_factory,
-    scoped_ptr<QuicServerInfo> server_info,
-    const QuicServerId& server_id,
-    const QuicConfig& config,
-    QuicCryptoClientConfig* crypto_config,
-    base::TaskRunner* task_runner,
-    NetLog* net_log)
-    : QuicClientSessionBase(connection,
-                            config),
-      server_host_port_(server_id.host_port_pair()),
+QuicClientSession::QuicClientSession(QuicConnection* connection,
+                                     scoped_ptr<DatagramClientSocket> socket,
+                                     scoped_ptr<QuicDefaultPacketWriter> writer,
+                                     QuicStreamFactory* stream_factory,
+                                     scoped_ptr<QuicServerInfo> server_info,
+                                     const QuicConfig& config,
+                                     base::TaskRunner* task_runner,
+                                     NetLog* net_log)
+    : QuicClientSessionBase(connection, config),
       require_confirmation_(false),
       stream_factory_(stream_factory),
       socket_(socket.Pass()),
       writer_(writer.Pass()),
       read_buffer_(new IOBufferWithSize(kMaxPacketSize)),
       server_info_(server_info.Pass()),
       read_pending_(false),
       num_total_streams_(0),
       task_runner_(task_runner),
       net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_QUIC_SESSION)),
       logger_(net_log_),
       num_packets_read_(0),
       going_away_(false),
       weak_factory_(this) {
+  connection->set_debug_visitor(&logger_);
+}
+
+void QuicClientSession::InitializeSession(
+    const QuicServerId& server_id,
+    QuicCryptoClientConfig* crypto_config,
+    QuicCryptoClientStreamFactory* crypto_client_stream_factory) {
+  QuicClientSessionBase::InitializeSession();

[ramant (doing other things), 2014/07/16 03:22:57]

Hi Ryan,
  Tried to keep this class similar to server's QuicClientSession. Would
appreciate your opinion of this change. Is there a better way to organize this
code? thanks much.

[Ryan Hamilton, 2014/07/16 15:53:32]

Seems reasonable to me!

+  server_host_port_.reset(new HostPortPair(server_id.host_port_pair()));
   crypto_stream_.reset(
       crypto_client_stream_factory ?
           crypto_client_stream_factory->CreateQuicCryptoClientStream(
               server_id, this, crypto_config) :
           new QuicCryptoClientStream(server_id, this,
                                      new ProofVerifyContextChromium(net_log_),
                                      crypto_config));
 
-  connection->set_debug_visitor(&logger_);
   // TODO(rch): pass in full host port proxy pair
   net_log_.BeginEvent(
       NetLog::TYPE_QUIC_SESSION,
       NetLog::StringCallback("host", &server_id.host()));
 }
 
 QuicClientSession::~QuicClientSession() {
   if (!streams()->empty())
     RecordUnexpectedOpenStreams(DESTRUCTOR);
   if (!observers_.empty())
@@ skipping 247 matching lines @@
   ssl_info->security_bits = security_bits;
   ssl_info->handshake_type = SSLInfo::HANDSHAKE_FULL;
   return true;
 }
 
 int QuicClientSession::CryptoConnect(bool require_confirmation,
                                      const CompletionCallback& callback) {
   require_confirmation_ = require_confirmation;
   handshake_start_ = base::TimeTicks::Now();
   RecordHandshakeState(STATE_STARTED);
+  DCHECK(flow_controller());
   if (!crypto_stream_->CryptoConnect()) {
     // TODO(wtc): change crypto_stream_.CryptoConnect() to return a
     // QuicErrorCode and map it to a net error code.
     return ERR_CONNECTION_FAILED;
   }
 
   if (IsCryptoHandshakeConfirmed())
     return OK;
 
   // Unless we require handshake confirmation, activate the session if
@@ skipping 43 matching lines @@
   // and for connections on which client certs were sent. It is also prohibited
   // when channel ID was sent if the hosts are from different eTLDs+1.
   if (!ssl_info.cert->VerifyNameMatch(hostname, &unused))
     return false;
 
   if (ssl_info.client_cert_sent)
     return false;
 
   if (ssl_info.channel_id_sent &&
       ServerBoundCertService::GetDomainForHost(hostname) !=
-      ServerBoundCertService::GetDomainForHost(server_host_port_.host())) {
+      ServerBoundCertService::GetDomainForHost(server_host_port_->host())) {
     return false;
   }
 
   return true;
 }
 
 QuicDataStream* QuicClientSession::CreateIncomingDataStream(
     QuicStreamId id) {
   DLOG(ERROR) << "Server push not supported";
   return NULL;
@@ skipping 336 matching lines @@
     return;
 
   // TODO(rch): re-enable this code once beta is cut.
   //  if (stream_factory_)
   //    stream_factory_->OnSessionConnectTimeout(this);
   //  CloseAllStreams(ERR_QUIC_HANDSHAKE_FAILED);
   //  DCHECK_EQ(0u, GetNumOpenStreams());
 }
 
 }  // namespace net