Land Recent QUIC Changes.

net/quic/test_tools/crypto_test_utils_nss.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 <keyhi.h>
 #include <pk11pub.h>
 #include <sechash.h>
 
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "crypto/ec_private_key.h"
 #include "net/quic/crypto/channel_id.h"
 
 using base::StringPiece;
 using std::string;
 
 namespace net {
 
 namespace test {
 
 // TODO(rtenneti): Implement NSS support ChannelIDSigner. Convert Sign() to be
 // asynchronous using completion callback. After porting TestChannelIDSigner,
 // implement real ChannelIDSigner.
 class TestChannelIDSigner : public ChannelIDSigner {
  public:
-  virtual ~TestChannelIDSigner() {
+  virtual ~TestChannelIDSigner() OVERRIDE {
     STLDeleteValues(&hostname_to_key_);
   }
 
   // ChannelIDSigner implementation.
 
   virtual bool Sign(const string& hostname,
                     StringPiece signed_data,
                     string* out_key,
                     string* out_signature) OVERRIDE {
     crypto::ECPrivateKey* ecdsa_keypair = HostnameToKey(hostname);
@@ skipping 90 matching lines @@
 };
 
 // static
 ChannelIDSigner* CryptoTestUtils::ChannelIDSignerForTesting() {
   return new TestChannelIDSigner();
 }
 
 }  // namespace test
 
 }  // namespace net