Land Recent QUIC changes.

net/tools/quic/quic_client.h

Index: net/tools/quic/quic_client.h
diff --git a/net/tools/quic/quic_client.h b/net/tools/quic/quic_client.h
index 9cfaa3e005c6ae7f206923462f73fda74827355b..0ce91047a39a4f324a2a0ac46746d63aee74a206 100644
--- a/net/tools/quic/quic_client.h
+++ b/net/tools/quic/quic_client.h
@@ -24,6 +24,10 @@
 namespace net {
 namespace tools {
 
+namespace test {
+class QuicClientPeer;
+}  // namespace test
+
 class QuicClient : public EpollCallbackInterface {
  public:
   QuicClient(IPEndPoint server_address, const std::string& server_hostname);
@@ -108,6 +112,8 @@ class QuicClient : public EpollCallbackInterface {
   int fd() { return fd_; }
 
  private:
+  friend class net::tools::test::QuicClientPeer;
+
   // Read a UDP packet and hand it to the framer.
   bool ReadAndProcessPacket();