Land Recent QUIC Changes until 03/15/2015.

net/quic/test_tools/quic_test_utils.h

 // 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.
 //
 // Common utilities for Quic tests
 
 #ifndef NET_QUIC_TEST_TOOLS_QUIC_TEST_UTILS_H_
 #define NET_QUIC_TEST_TOOLS_QUIC_TEST_UTILS_H_
 
 #include <string>
@@ skipping 281 matching lines @@
  public:
   // Uses a MockHelper, ConnectionId of 42, and 127.0.0.1:123.
   explicit MockConnection(Perspective perspective);
 
   // Uses a MockHelper, ConnectionId of 42, and 127.0.0.1:123.
   MockConnection(Perspective perspective, bool is_secure);
 
   // Uses a MockHelper, ConnectionId of 42.
   MockConnection(IPEndPoint address, Perspective perspective);
 
-  // Uses a MockHelper, and 127.0.0.1:123
+  // Uses a MockHelper, and 127.0.0.1:123.
   MockConnection(QuicConnectionId connection_id, Perspective perspective);
 
+  // Uses a MockHelper, and 127.0.0.1:123.
+  MockConnection(QuicConnectionId connection_id,
+                 Perspective perspective,
+                 bool is_secure);
+
   // Uses a Mock helper, ConnectionId of 42, and 127.0.0.1:123.
   MockConnection(Perspective perspective,
                  const QuicVersionVector& supported_versions);
 
   ~MockConnection() override;
 
   // If the constructor that uses a MockHelper has been used then this method
   // will advance the time of the MockClock.
   void AdvanceTime(QuicTime::Delta delta);
 
@@ skipping 296 matching lines @@
   // clears the pointer to it to prevent use-after-free.
   void Unregister(PerConnectionPacketWriter* writer);
 
   PerConnectionPacketWriter* current_writer_;
 };
 
 }  // namespace test
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_QUIC_TEST_UTILS_H_