Update from https://crrev.com/309717

crypto/secure_hash_default.cc

 // 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.
 
 #include "crypto/secure_hash.h"
 
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "crypto/third_party/nss/chromium-blapi.h"
 #include "crypto/third_party/nss/chromium-sha256.h"
 
 namespace crypto {
 
 namespace {
 
 const char kSHA256Descriptor[] = "NSS";
 
 class SecureHashSHA256NSS : public SecureHash {
  public:
   static const int kSecureHashVersion = 1;
 
   SecureHashSHA256NSS() {
     SHA256_Begin(&ctx_);
   }
 
-  virtual ~SecureHashSHA256NSS() {
-    memset(&ctx_, 0, sizeof(ctx_));
-  }
+  ~SecureHashSHA256NSS() override { memset(&ctx_, 0, sizeof(ctx_)); }
 
   // SecureHash implementation:
-  virtual void Update(const void* input, size_t len) override {
+  void Update(const void* input, size_t len) override {
     SHA256_Update(&ctx_, static_cast<const unsigned char*>(input), len);
   }
 
-  virtual void Finish(void* output, size_t len) override {
+  void Finish(void* output, size_t len) override {
     SHA256_End(&ctx_, static_cast<unsigned char*>(output), NULL,
                static_cast<unsigned int>(len));
   }
 
-  virtual bool Serialize(Pickle* pickle) override;
-  virtual bool Deserialize(PickleIterator* data_iterator) override;
+  bool Serialize(Pickle* pickle) override;
+  bool Deserialize(PickleIterator* data_iterator) override;
 
  private:
   SHA256Context ctx_;
 };
 
 bool SecureHashSHA256NSS::Serialize(Pickle* pickle) {
   if (!pickle)
     return false;
 
   if (!pickle->WriteInt(kSecureHashVersion) ||
@@ skipping 35 matching lines @@
   switch (algorithm) {
     case SHA256:
       return new SecureHashSHA256NSS();
     default:
       NOTIMPLEMENTED();
       return NULL;
   }
 }
 
 }  // namespace crypto