Land Recent QUIC Changes until 03/15/2015.

net/quic/test_tools/quic_test_utils.h

Index: net/quic/test_tools/quic_test_utils.h
diff --git a/net/quic/test_tools/quic_test_utils.h b/net/quic/test_tools/quic_test_utils.h
index 2be080b22877b173ea66db61f006ca415eb7a369..3d5dd0575110dad759f78a4dca40222df3924b28 100644
--- a/net/quic/test_tools/quic_test_utils.h
+++ b/net/quic/test_tools/quic_test_utils.h
@@ -299,9 +299,14 @@ class MockConnection : public QuicConnection {
   // 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);