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 150 matching lines @@
     DCHECK(!session_.get());
     supported_versions_ = versions;
   }
 
   // Takes ownership of the listener.
   void set_response_listener(ResponseListener* listener) {
     response_listener_.reset(listener);
   }
 
  protected:
-  virtual QuicGuid GenerateGuid();
+  virtual QuicConnectionId GenerateConnectionId();
   virtual QuicEpollConnectionHelper* CreateQuicConnectionHelper();
   virtual QuicPacketWriter* CreateQuicPacketWriter();
 
  private:
   friend class net::tools::test::QuicClientPeer;
 
   // Read a UDP packet and hand it to the framer.
   bool ReadAndProcessPacket();
 
   // Address of the server.
@@ skipping 54 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_