Update from https://crrev.com/309717

net/base/sdch_manager_unittest.cc

 // Copyright 2014 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 <limits.h>
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 47 matching lines @@
 class SdchManagerTest : public testing::Test {
  protected:
   SdchManagerTest()
       : sdch_manager_(new SdchManager),
         default_support_(false),
         default_https_support_(false) {
     default_support_ = sdch_manager_->sdch_enabled();
     default_https_support_ = sdch_manager_->secure_scheme_supported();
   }
 
-  virtual ~SdchManagerTest() {}
+  ~SdchManagerTest() override {}
 
   SdchManager* sdch_manager() { return sdch_manager_.get(); }
 
   // Reset globals back to default state.
   void TearDown() override {
     SdchManager::EnableSdchSupport(default_support_);
     SdchManager::EnableSecureSchemeSupport(default_https_support_);
   }
 
   // Attempt to add a dictionary to the manager and probe for success or
@@ skipping 594 matching lines @@
   scoped_ptr<SdchManager> sdch_manager(new SdchManager);
 
   EXPECT_EQ(SDCH_DISABLED, sdch_manager->IsInSupportedDomain(google_url));
   SdchManager::EnableSdchSupport(true);
   EXPECT_EQ(SDCH_OK, sdch_manager->IsInSupportedDomain(google_url));
 }
 
 #endif  // !defined(OS_IOS)
 
 }  // namespace net