Land Recent QUIC Changes

net/quic/test_tools/quic_test_utils.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/test_tools/quic_test_utils.h"
 
 #include "base/stl_util.h"
 #include "net/quic/crypto/crypto_framer.h"
 #include "net/quic/crypto/crypto_handshake.h"
 #include "net/quic/crypto/crypto_utils.h"
@@ skipping 109 matching lines @@
 }
 
 const QuicClock* MockHelper::GetClock() const {
   return &clock_;
 }
 
 QuicRandom* MockHelper::GetRandomGenerator() {
   return &random_generator_;
 }
 
+void MockHelper::AdvanceTime(QuicTime::Delta delta) {
+  clock_.AdvanceTime(delta);
+}
+
 MockConnection::MockConnection(QuicGuid guid,
                                IPEndPoint address,
                                bool is_server)
-    : QuicConnection(guid, address, new MockHelper(), is_server) {
+    : QuicConnection(guid, address, new MockHelper(), is_server),
+      has_mock_helper_(true) {
 }
 
 MockConnection::MockConnection(QuicGuid guid,
                                IPEndPoint address,
                                QuicConnectionHelperInterface* helper,
                                bool is_server)
-    : QuicConnection(guid, address, helper, is_server) {
+    : QuicConnection(guid, address, helper, is_server),
+      has_mock_helper_(false) {
 }
 
 MockConnection::~MockConnection() {
 }
 
+void MockConnection::AdvanceTime(QuicTime::Delta delta) {
+  CHECK(has_mock_helper_) << "Cannot advance time unless a MockClock is being"
+                             " used";
+  static_cast<MockHelper*>(helper())->AdvanceTime(delta);
+}
+
 PacketSavingConnection::PacketSavingConnection(QuicGuid guid,
                                                IPEndPoint address,
                                                bool is_server)
     : MockConnection(guid, address, is_server) {
 }
 
 PacketSavingConnection::~PacketSavingConnection() {
   STLDeleteElements(&packets_);
 }
 
@@ skipping 147 matching lines @@
       QuicPacketCreator::StreamFramePacketOverhead(1, include_version);
 }
 
 QuicPacketEntropyHash TestEntropyCalculator::ReceivedEntropyHash(
     QuicPacketSequenceNumber sequence_number) const {
   return 1u;
 }
 
 }  // namespace test
 }  // namespace net