Land Recent QUIC Changes.

net/tools/quic/test_tools/quic_test_client.h

Index: net/tools/quic/test_tools/quic_test_client.h
diff --git a/net/tools/quic/test_tools/quic_test_client.h b/net/tools/quic/test_tools/quic_test_client.h
index 1c70c33a18644164525c951feb1350f32c5387dd..93c0352bca69dbeae5351f84a987451ec6562df1 100644
--- a/net/tools/quic/test_tools/quic_test_client.h
+++ b/net/tools/quic/test_tools/quic_test_client.h
@@ -14,6 +14,7 @@
 #include "net/quic/quic_packet_creator.h"
 #include "net/quic/quic_protocol.h"
 #include "net/tools/balsa/balsa_frame.h"
+#include "net/tools/epoll_server/epoll_server.h"
 #include "net/tools/quic/quic_client.h"
 #include "net/tools/quic/test_tools/simple_client.h"
 
@@ -35,12 +36,14 @@ class MockableQuicClient : public QuicClient {
  public:
   MockableQuicClient(IPEndPoint server_address,
                      const QuicServerId& server_id,
-                     const QuicVersionVector& supported_versions);
+                     const QuicVersionVector& supported_versions,
+                     EpollServer* epoll_server);
 
   MockableQuicClient(IPEndPoint server_address,
                      const QuicServerId& server_id,
                      const QuicConfig& config,
-                     const QuicVersionVector& supported_versions);
+                     const QuicVersionVector& supported_versions,
+                     EpollServer* epoll_server);
 
   virtual ~MockableQuicClient() OVERRIDE;
   virtual QuicPacketWriter* CreateQuicPacketWriter() OVERRIDE;
@@ -79,6 +82,9 @@ class QuicTestClient : public SimpleClient,
   // name is recorded and available with |cert_common_name()|.
   void ExpectCertificates(bool on);
 
+  // Sets the |user_agent_id| of the |client_|.
+  void SetUserAgentID(const string& user_agent_id);
+
   // Wraps data in a quic packet and sends it.
   ssize_t SendData(string data, bool last_data);
 
@@ -157,6 +163,8 @@ class QuicTestClient : public SimpleClient,
 
   void WaitForWriteToFlush();
 
+  EpollServer* epoll_server() { return &epoll_server_; }
+
  protected:
   QuicTestClient();
 
@@ -165,6 +173,7 @@ class QuicTestClient : public SimpleClient,
   void set_client(MockableQuicClient* client) { client_.reset(client); }
 
  private:
+  EpollServer epoll_server_;
   scoped_ptr<MockableQuicClient> client_;  // The actual client
   QuicSpdyClientStream* stream_;