Land Recent QUIC changes.

net/quic/test_tools/quic_connection_peer.cc

Index: net/quic/test_tools/quic_connection_peer.cc
diff --git a/net/quic/test_tools/quic_connection_peer.cc b/net/quic/test_tools/quic_connection_peer.cc
index 6e32e6cc247220fe4b762dba3dba9b6dc4bd30b8..8c4c24554bfe8735b180a5ac025096c355ce463a 100644
--- a/net/quic/test_tools/quic_connection_peer.cc
+++ b/net/quic/test_tools/quic_connection_peer.cc
@@ -122,6 +122,12 @@ void QuicConnectionPeer::SetIsServer(QuicConnection* connection,
 }
 
 // static
+void QuicConnectionPeer::SetSelfAddress(QuicConnection* connection,
+                                        const IPEndPoint& self_address) {
+  connection->self_address_ = self_address;
+}
+
+// static
 void QuicConnectionPeer::SwapCrypters(QuicConnection* connection,
                                       QuicFramer* framer) {
   framer->SwapCryptersForTest(&connection->framer_);