Upstream version 9.38.198.0

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

diff --git a/src/net/tools/quic/test_tools/quic_test_utils.cc b/src/net/tools/quic/test_tools/quic_test_utils.cc
index d46eae5..255fbc0 100644 (file)
--- a/src/net/tools/quic/test_tools/quic_test_utils.cc
+++ b/src/net/tools/quic/test_tools/quic_test_utils.cc
@@ -23,8 +23,8 @@ MockConnection::MockConnection(bool is_server)
                      IPEndPoint(net::test::Loopback4(), kTestPort),
                      new testing::NiceMock<MockHelper>(),
                      new testing::NiceMock<MockPacketWriter>(),
+                     true  /* owns_writer */,
                      is_server, QuicSupportedVersions()),
-      writer_(QuicConnectionPeer::GetWriter(this)),
       helper_(helper()) {
 }
 
@@ -33,8 +33,8 @@ MockConnection::MockConnection(IPEndPoint address,
     : QuicConnection(kTestConnectionId, address,
                      new testing::NiceMock<MockHelper>(),
                      new testing::NiceMock<MockPacketWriter>(),
+                     true  /* owns_writer */,
                      is_server, QuicSupportedVersions()),
-      writer_(QuicConnectionPeer::GetWriter(this)),
       helper_(helper()) {
 }
 
@@ -44,8 +44,8 @@ MockConnection::MockConnection(QuicConnectionId connection_id,
                      IPEndPoint(net::test::Loopback4(), kTestPort),
                      new testing::NiceMock<MockHelper>(),
                      new testing::NiceMock<MockPacketWriter>(),
+                     true  /* owns_writer */,
                      is_server, QuicSupportedVersions()),
-      writer_(QuicConnectionPeer::GetWriter(this)),
       helper_(helper()) {
 }
 
@@ -55,8 +55,8 @@ MockConnection::MockConnection(bool is_server,
                      IPEndPoint(net::test::Loopback4(), kTestPort),
                      new testing::NiceMock<MockHelper>(),
                      new testing::NiceMock<MockPacketWriter>(),
+                     true  /* owns_writer */,
                      is_server, QuicSupportedVersions()),
-      writer_(QuicConnectionPeer::GetWriter(this)),
       helper_(helper()) {
 }
 
@@ -69,19 +69,19 @@ void MockConnection::AdvanceTime(QuicTime::Delta delta) {
 
 QuicAckFrame MakeAckFrameWithNackRanges(
     size_t num_nack_ranges, QuicPacketSequenceNumber least_unacked) {
-  QuicAckFrame ack = MakeAckFrame(2 * num_nack_ranges + least_unacked,
-                                  least_unacked);
+  QuicAckFrame ack = MakeAckFrame(2 * num_nack_ranges + least_unacked);
   // Add enough missing packets to get num_nack_ranges nack ranges.
   for (QuicPacketSequenceNumber i = 1; i < 2 * num_nack_ranges; i += 2) {
-    ack.received_info.missing_packets.insert(least_unacked + i);
+    ack.missing_packets.insert(least_unacked + i);
   }
   return ack;
 }
 
 TestSession::TestSession(QuicConnection* connection,
                          const QuicConfig& config)
-  : QuicSession(connection, config),
-    crypto_stream_(NULL) {
+    : QuicSession(connection, config),
+      crypto_stream_(NULL) {
+  InitializeSession();
 }
 
 TestSession::~TestSession() {}