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 1ed88276a0b6a69dd29e1dce65e45784d66b6100..090a1f21c2dd4d35ccc77d1ad9b761abeefb2785 100644
--- a/net/quic/test_tools/quic_connection_peer.h
+++ b/net/quic/test_tools/quic_connection_peer.h
@@ -6,6 +6,7 @@
 #define NET_QUIC_TEST_TOOLS_QUIC_CONNECTION_PEER_H_
 
 #include "base/basictypes.h"
+#include "net/base/ip_endpoint.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_stats.h"
 
@@ -73,6 +74,9 @@ class QuicConnectionPeer {
 
   static void SetIsServer(QuicConnection* connection, bool is_server);
 
+  static void SetSelfAddress(QuicConnection* connection,
+                             const IPEndPoint& self_address);
+
   static void SwapCrypters(QuicConnection* connection, QuicFramer* framer);
 
   static void SetMaxPacketsPerRetransmissionAlarm(QuicConnection* connection,