Land Recent QUIC Changes.

net/quic/test_tools/crypto_test_utils_openssl.cc

 // Copyright 2013 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.
 
 #include "net/quic/test_tools/crypto_test_utils.h"
 
 #include <openssl/bn.h>
 #include <openssl/ec.h>
 #include <openssl/ecdsa.h>
 #include <openssl/evp.h>
@@ skipping 14 matching lines @@
 }
 
 } // namespace anonymous
 
 namespace net {
 
 namespace test {
 
 class TestChannelIDSigner : public ChannelIDSigner {
  public:
-  virtual ~TestChannelIDSigner() { }
+  virtual ~TestChannelIDSigner() OVERRIDE { }
 
   // ChannelIDSigner implementation.
 
   virtual bool Sign(const string& hostname,
                     StringPiece signed_data,
                     string* out_key,
                     string* out_signature) OVERRIDE {
     crypto::ScopedOpenSSL<EVP_PKEY, EVP_PKEY_free> ecdsa_key(
         HostnameToKey(hostname));
 
@@ skipping 118 matching lines @@
 };
 
 // static
 ChannelIDSigner* CryptoTestUtils::ChannelIDSignerForTesting() {
   return new TestChannelIDSigner();
 }
 
 }  // namespace test
 
 }  // namespace net