QUIC - undo the chromium specific changes from the following CL which

net/quic/quic_client_session_test.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 <vector>
 
 #include "base/files/file_path.h"
 #include "base/rand_util.h"
@@ skipping 54 matching lines @@
   QuicVersion version_;
   QuicPacketHeader header_;
 };
 
 class QuicClientSessionTest : public ::testing::TestWithParam<QuicVersion> {
  protected:
   QuicClientSessionTest()
       : writer_(new TestPacketWriter(GetParam())),
         connection_(
             new PacketSavingConnection(false, SupportedVersions(GetParam()))),
-        session_(connection_, GetSocket().Pass(), writer_.Pass(), NULL,
-                 make_scoped_ptr((QuicServerInfo*)NULL), DefaultQuicConfig(),
+        session_(connection_, GetSocket().Pass(), writer_.Pass(), NULL, NULL,
+                 make_scoped_ptr((QuicServerInfo*)NULL),
+                 QuicServerId(kServerHostname, kServerPort, false,
+                              PRIVACY_MODE_DISABLED),
+                 DefaultQuicConfig(), &crypto_config_,
                  base::MessageLoop::current()->message_loop_proxy().get(),
                  &net_log_) {
-    session_.InitializeSession(QuicServerId(kServerHostname, kServerPort, false,
-                                            PRIVACY_MODE_DISABLED),
-                               &crypto_config_, NULL);
+    session_.InitializeSession();
     session_.config()->SetDefaults();
     crypto_config_.SetDefaults();
   }
 
   virtual void TearDown() OVERRIDE {
     session_.CloseSessionOnError(ERR_ABORTED);
   }
 
   scoped_ptr<DatagramClientSocket> GetSocket() {
     socket_factory_.AddSocketDataProvider(&socket_data_);
@@ skipping 121 matching lines @@
 
   EXPECT_TRUE(session_.CanPool("www.example.org"));
   EXPECT_TRUE(session_.CanPool("mail.example.org"));
   EXPECT_FALSE(session_.CanPool("mail.example.com"));
   EXPECT_FALSE(session_.CanPool("mail.google.com"));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net