Update To 11.40.268.0

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

diff --git a/src/net/tools/quic/quic_client_session.cc b/src/net/tools/quic/quic_client_session.cc
index 0e7a7a2..87ca0ce 100644 (file)
--- a/src/net/tools/quic/quic_client_session.cc
+++ b/src/net/tools/quic/quic_client_session.cc
@@ -15,8 +15,9 @@ namespace net {
 namespace tools {
 
 QuicClientSession::QuicClientSession(const QuicConfig& config,
-                                     QuicConnection* connection)
-    : QuicClientSessionBase(connection, config) {
+                                     QuicConnection* connection,
+                                     bool is_secure)
+    : QuicClientSessionBase(connection, config, is_secure) {
 }
 
 QuicClientSession::~QuicClientSession() {
@@ -27,7 +28,7 @@ void QuicClientSession::InitializeSession(
     QuicCryptoClientConfig* crypto_config) {
   QuicClientSessionBase::InitializeSession();
   crypto_stream_.reset(
-      new QuicCryptoClientStream(server_id, this, NULL, crypto_config));
+      new QuicCryptoClientStream(server_id, this, nullptr, crypto_config));
 }
 
 void QuicClientSession::OnProofValid(
@@ -41,17 +42,17 @@ void QuicClientSession::OnProofVerifyDetailsAvailable(
 QuicSpdyClientStream* QuicClientSession::CreateOutgoingDataStream() {
   if (!crypto_stream_->encryption_established()) {
     DVLOG(1) << "Encryption not active so no outgoing stream created.";
-    return NULL;
+    return nullptr;
   }
   if (GetNumOpenStreams() >= get_max_open_streams()) {
     DVLOG(1) << "Failed to create a new outgoing stream. "
              << "Already " << GetNumOpenStreams() << " open.";
-    return NULL;
+    return nullptr;
   }
   if (goaway_received()) {
     DVLOG(1) << "Failed to create a new outgoing stream. "
              << "Already received goaway.";
-    return NULL;
+    return nullptr;
   }
   QuicSpdyClientStream* stream
       = new QuicSpdyClientStream(GetNextStreamId(), this);
@@ -75,7 +76,7 @@ int QuicClientSession::GetNumSentClientHellos() const {
 QuicDataStream* QuicClientSession::CreateIncomingDataStream(
     QuicStreamId id) {
   DLOG(ERROR) << "Server push not supported";
-  return NULL;
+  return nullptr;
 }
 
 }  // namespace tools