Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / net / quic / quic_client_session_test.cc

diff --git a/src/net/quic/quic_client_session_test.cc b/src/net/quic/quic_client_session_test.cc
index ed45639..8860f2e 100644 (file)
--- a/src/net/quic/quic_client_session_test.cc
+++ b/src/net/quic/quic_client_session_test.cc
@@ -43,21 +43,19 @@ class QuicClientSessionTest : public ::testing::TestWithParam<QuicVersion> {
   QuicClientSessionTest()
       : connection_(
             new PacketSavingConnection(false, SupportedVersions(GetParam()))),
-        session_(connection_, GetSocket().Pass(), NULL,
+        session_(connection_, GetSocket().Pass(), nullptr,
                  &transport_security_state_,
-                 make_scoped_ptr((QuicServerInfo*)NULL), DefaultQuicConfig(),
+                 make_scoped_ptr((QuicServerInfo*)nullptr), DefaultQuicConfig(),
+                 /*is_secure=*/false,
                  base::MessageLoop::current()->message_loop_proxy().get(),
                  &net_log_) {
-    session_.InitializeSession(QuicServerId(kServerHostname, kServerPort, false,
+    session_.InitializeSession(QuicServerId(kServerHostname, kServerPort,
+                                            /*is_secure=*/false,
                                             PRIVACY_MODE_DISABLED),
-                                &crypto_config_, NULL);
-    session_.config()->SetDefaults();
-    crypto_config_.SetDefaults();
+        &crypto_config_, nullptr);
   }
 
-  virtual void TearDown() OVERRIDE {
-    session_.CloseSessionOnError(ERR_ABORTED);
-  }
+  void TearDown() override { session_.CloseSessionOnError(ERR_ABORTED); }
 
   scoped_ptr<DatagramClientSocket> GetSocket() {
     socket_factory_.AddSocketDataProvider(&socket_data_);
@@ -131,7 +129,7 @@ TEST_P(QuicClientSessionTest, MaxNumStreamsViaRequest) {
   session_.CloseStream(streams[0]->id());
   ASSERT_TRUE(callback.have_result());
   EXPECT_EQ(OK, callback.WaitForResult());
-  EXPECT_TRUE(stream != NULL);
+  EXPECT_TRUE(stream != nullptr);
 }
 
 TEST_P(QuicClientSessionTest, GoAwayReceived) {
@@ -140,7 +138,7 @@ TEST_P(QuicClientSessionTest, GoAwayReceived) {
   // After receiving a GoAway, I should no longer be able to create outgoing
   // streams.
   session_.OnGoAway(QuicGoAwayFrame(QUIC_PEER_GOING_AWAY, 1u, "Going away."));
-  EXPECT_EQ(NULL, session_.CreateOutgoingDataStream());
+  EXPECT_EQ(nullptr, session_.CreateOutgoingDataStream());
 }
 
 TEST_P(QuicClientSessionTest, CanPool) {