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 da934ff7f1974e657f350fd61ef06a382110d790..13aff636ada902781c061467be435ea925d9f04f 100644
--- a/net/tools/quic/quic_client.h
+++ b/net/tools/quic/quic_client.h
@@ -47,15 +47,19 @@ class QuicClient : public EpollCallbackInterface,
                                     const string& response_body) = 0;
   };
 
+  // Create a quic client, which will have events managed by an externally owned
+  // EpollServer.
   QuicClient(IPEndPoint server_address,
              const QuicServerId& server_id,
              const QuicVersionVector& supported_versions,
-             bool print_response);
+             bool print_response,
+             EpollServer* epoll_server);
   QuicClient(IPEndPoint server_address,
              const QuicServerId& server_id,
              const QuicVersionVector& supported_versions,
              bool print_response,
-             const QuicConfig& config);
+             const QuicConfig& config,
+             EpollServer* epoll_server);
 
   virtual ~QuicClient();
 
@@ -131,7 +135,7 @@ class QuicClient : public EpollCallbackInterface,
 
   const IPEndPoint& client_address() const { return client_address_; }
 
-  EpollServer* epoll_server() { return &epoll_server_; }
+  EpollServer* epoll_server() { return epoll_server_; }
 
   int fd() { return fd_; }
 
@@ -142,6 +146,10 @@ class QuicClient : public EpollCallbackInterface,
     server_id_ = server_id;
   }
 
+  void SetUserAgentID(const string& user_agent_id) {
+    crypto_config_.set_user_agent_id(user_agent_id);
+  }
+
   // SetProofVerifier sets the ProofVerifier that will be used to verify the
   // server's certificate and takes ownership of |verifier|.
   void SetProofVerifier(ProofVerifier* verifier) {
@@ -208,7 +216,7 @@ class QuicClient : public EpollCallbackInterface,
   // Session which manages streams.
   scoped_ptr<QuicClientSession> session_;
   // Listens for events on the client socket.
-  EpollServer epoll_server_;
+  EpollServer* epoll_server_;
   // UDP socket.
   int fd_;