Land Recent QUIC Changes.

net/tools/quic/test_tools/quic_test_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.
 
 #ifndef NET_QUIC_TEST_TOOLS_QUIC_TEST_CLIENT_H_
 #define NET_QUIC_TEST_TOOLS_QUIC_TEST_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 22 matching lines @@
   QuicTestClient(IPEndPoint server_address,
                  const string& server_hostname,
                  bool secure,
                  const QuicVersionVector& supported_versions);
   QuicTestClient(IPEndPoint server_address,
                  const string& server_hostname,
                  bool secure,
                  const QuicConfig& config,
                  const QuicVersionVector& supported_versions);
 
-  virtual ~QuicTestClient();
+  virtual ~QuicTestClient() OVERRIDE;
 
   // ExpectCertificates controls whether the server is expected to provide
   // certificates. The certificates, if any, are not verified, but the common
   // name is recorded and available with |cert_common_name()|.
   void ExpectCertificates(bool on);
 
   // Clears any outstanding state and sends a simple GET of 'uri' to the
   // server.  Returns 0 if the request failed and no bytes were written.
   ssize_t SendRequest(const string& uri);
   ssize_t SendMessage(const HTTPMessage& message);
@@ skipping 96 matching lines @@
   // client_.
   ProofVerifier* proof_verifier_;
 };
 
 }  // namespace test
 
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_QUIC_TEST_CLIENT_H_