Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / net / quic / test_tools / crypto_test_utils_nss.cc

diff --git a/src/net/quic/test_tools/crypto_test_utils_nss.cc b/src/net/quic/test_tools/crypto_test_utils_nss.cc
index 2ab1c24..f427750 100644 (file)
--- a/src/net/quic/test_tools/crypto_test_utils_nss.cc
+++ b/src/net/quic/test_tools/crypto_test_utils_nss.cc
@@ -20,16 +20,14 @@ namespace test {
 
 class TestChannelIDSource : public ChannelIDSource {
  public:
-  virtual ~TestChannelIDSource() {
-    STLDeleteValues(&hostname_to_key_);
-  }
+  ~TestChannelIDSource() override { STLDeleteValues(&hostname_to_key_); }
 
   // ChannelIDSource implementation.
 
-  virtual QuicAsyncStatus GetChannelIDKey(
+  QuicAsyncStatus GetChannelIDKey(
       const string& hostname,
       scoped_ptr<ChannelIDKey>* channel_id_key,
-      ChannelIDSourceCallback* /*callback*/) OVERRIDE {
+      ChannelIDSourceCallback* /*callback*/) override {
     channel_id_key->reset(new ChannelIDKeyChromium(HostnameToKey(hostname)));
     return QUIC_SUCCESS;
   }
@@ -45,7 +43,7 @@ class TestChannelIDSource : public ChannelIDSource {
 
     crypto::ECPrivateKey* keypair = crypto::ECPrivateKey::Create();
     if (!keypair) {
-      return NULL;
+      return nullptr;
     }
     hostname_to_key_[hostname] = keypair;
     return keypair->Copy();