Land Recent QUIC Changes

net/quic/test_tools/quic_connection_peer.h

Index: net/quic/test_tools/quic_connection_peer.h
diff --git a/net/quic/test_tools/quic_connection_peer.h b/net/quic/test_tools/quic_connection_peer.h
index 8c3ff67e8717e964189b0ef2caf8891110e57507..97f7afa9975810460ecc5eb3111564aff9ae3c08 100644
--- a/net/quic/test_tools/quic_connection_peer.h
+++ b/net/quic/test_tools/quic_connection_peer.h
@@ -7,6 +7,7 @@
 
 #include "base/basictypes.h"
 #include "net/quic/quic_protocol.h"
+#include "net/quic/quic_stats.h"
 
 namespace net {
 
@@ -62,6 +63,10 @@ class QuicConnectionPeer {
       QuicConnection* connection,
       QuicPacketSequenceNumber sequence_number);
 
+  static bool IsServer(QuicConnection* connection);
+
+  static void SetIsServer(QuicConnection* connection, bool is_server);
+
  private:
   DISALLOW_COPY_AND_ASSIGN(QuicConnectionPeer);
 };