Land Recent QUIC Changes.

net/tools/quic/quic_client.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // A toy client, which connects to a specified port and sends QUIC
 // request to that endpoint.
 
 #ifndef NET_TOOLS_QUIC_QUIC_CLIENT_H_
 #define NET_TOOLS_QUIC_QUIC_CLIENT_H_
 
@@ skipping 117 matching lines @@
   }
 
   IPAddressNumber bind_to_address() const { return bind_to_address_; }
 
   void set_local_port(int local_port) { local_port_ = local_port; }
 
   const IPEndPoint& server_address() const { return server_address_; }
 
   const IPEndPoint& client_address() const { return client_address_; }
 
-  EpollServer* epoll_server() { return epoll_server_; }
-
   int fd() { return fd_; }
 
   const QuicServerId& server_id() const { return server_id_; }
 
   // This should only be set before the initial Connect()
   void set_server_id(const QuicServerId& server_id) {
     server_id_ = server_id;
   }
 
   void SetUserAgentID(const string& user_agent_id) {
@@ skipping 27 matching lines @@
  protected:
   virtual QuicConnectionId GenerateConnectionId();
   virtual QuicEpollConnectionHelper* CreateQuicConnectionHelper();
   virtual QuicPacketWriter* CreateQuicPacketWriter();
 
   virtual int ReadPacket(char* buffer,
                          int buffer_len,
                          IPEndPoint* server_address,
                          IPAddressNumber* client_ip);
 
+  EpollServer* epoll_server() { return epoll_server_; }
+
  private:
   friend class net::tools::test::QuicClientPeer;
 
   // Used during initialization: creates the UDP socket FD, sets socket options,
   // and binds the socket to our address.
   bool CreateUDPSocket();
 
   // Read a UDP packet and hand it to the framer.
   bool ReadAndProcessPacket();
 
@@ skipping 55 matching lines @@
   // when the stream is closed (in OnClose).
   bool print_response_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicClient);
 };
 
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_CLIENT_H_