Update from chromium https://crrev.com/301725/

net/ocsp/nss_ocsp_unittest.cc

Index: net/ocsp/nss_ocsp_unittest.cc
diff --git a/net/ocsp/nss_ocsp_unittest.cc b/net/ocsp/nss_ocsp_unittest.cc
index acbb785ba190f7fcd6003ec6d18b184f0c962025..745741e11d975496d6382ed1acd0407657165234 100644
--- a/net/ocsp/nss_ocsp_unittest.cc
+++ b/net/ocsp/nss_ocsp_unittest.cc
@@ -44,10 +44,10 @@ class AiaResponseHandler : public net::URLRequestInterceptor {
  public:
   AiaResponseHandler(const std::string& headers, const std::string& cert_data)
       : headers_(headers), cert_data_(cert_data), request_count_(0) {}
-  virtual ~AiaResponseHandler() {}
+  ~AiaResponseHandler() override {}
 
   // net::URLRequestInterceptor implementation:
-  virtual net::URLRequestJob* MaybeInterceptRequest(
+  net::URLRequestJob* MaybeInterceptRequest(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate) const override {
     ++const_cast<AiaResponseHandler*>(this)->request_count_;
@@ -75,9 +75,9 @@ class NssHttpTest : public ::testing::Test {
         handler_(NULL),
         verify_proc_(new CertVerifyProcNSS),
         verifier_(new MultiThreadedCertVerifier(verify_proc_.get())) {}
-  virtual ~NssHttpTest() {}
+  ~NssHttpTest() override {}
 
-  virtual void SetUp() {
+  void SetUp() override {
     std::string file_contents;
     ASSERT_TRUE(base::ReadFileToString(
         GetTestCertsDirectory().AppendASCII("aia-intermediate.der"),
@@ -97,7 +97,7 @@ class NssHttpTest : public ::testing::Test {
     EnsureNSSHttpIOInit();
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     ShutdownNSSHttpIO();
 
     if (handler_)