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 5b75b772e911cd2dc473d0ee0dce8c6b2b3c64f6..dc675a281dc55ce9710dee6a7aabde999b96c0ec 100644
--- a/net/quic/test_tools/quic_connection_peer.h
+++ b/net/quic/test_tools/quic_connection_peer.h
@@ -18,6 +18,7 @@ class QuicAlarm;
 class QuicConnection;
 class QuicConnectionHelperInterface;
 class QuicConnectionVisitorInterface;
+class QuicEncryptedPacket;
 class QuicFecGroup;
 class QuicFramer;
 class QuicPacketCreator;
@@ -29,8 +30,6 @@ class SendAlgorithmInterface;
 
 namespace test {
 
-class QuicTestWriter;
-
 // Peer to make public a number of otherwise private QuicConnection methods.
 class QuicConnectionPeer {
  public:
@@ -77,10 +76,6 @@ class QuicConnectionPeer {
       QuicConnection* connection,
       QuicPacketSequenceNumber sequence_number);
 
-  static bool IsWriteBlocked(QuicConnection* connection);
-
-  static void SetIsWriteBlocked(QuicConnection* connection, bool write_blocked);
-
   static bool IsServer(QuicConnection* connection);
 
   static void SetIsServer(QuicConnection* connection, bool is_server);
@@ -107,8 +102,10 @@ class QuicConnectionPeer {
   static QuicAlarm* GetTimeoutAlarm(QuicConnection* connection);
 
   static QuicPacketWriter* GetWriter(QuicConnection* connection);
-  static void SetWriter(QuicConnection* connection, QuicTestWriter* writer);
+  static void SetWriter(QuicConnection* connection, QuicPacketWriter* writer);
   static void CloseConnection(QuicConnection* connection);
+  static QuicEncryptedPacket* GetConnectionClosePacket(
+      QuicConnection* connection);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(QuicConnectionPeer);
@@ -118,4 +115,4 @@ class QuicConnectionPeer {
 
 }  // namespace net
 
-#endif  // NET_QUIC_TEST_TOOLS_QUIC_TEST_PEER_H_
+#endif  // NET_QUIC_TEST_TOOLS_QUIC_CONNECTION_PEER_H_