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

net/proxy/proxy_service_unittest.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 "net/proxy/proxy_service.h"
 
 #include <vector>
 
 #include "base/format_macros.h"
 #include "base/logging.h"
@@ skipping 80 matching lines @@
 //
 // We disable the polling in order to avoid any timing dependencies in the
 // tests. If the bot were to run the tests very slowly and we hadn't disabled
 // polling, then it might start a background re-try in the middle of our test
 // and confuse our expectations leading to flaky failures.
 //
 // The tests which verify the polling code re-enable the polling behavior but
 // are careful to avoid timing problems.
 class ProxyServiceTest : public testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     testing::Test::SetUp();
     previous_policy_ =
         ProxyService::set_pac_script_poll_policy(&never_poll_policy_);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     // Restore the original policy.
     ProxyService::set_pac_script_poll_policy(previous_policy_);
     testing::Test::TearDown();
   }
 
  private:
   NeverPollPolicy never_poll_policy_;
   const ProxyService::PacPollPolicy* previous_policy_;
 };
 
@@ skipping 3011 matching lines @@
       url, net::LOAD_NORMAL, &info, NULL, log.bound());
   EXPECT_TRUE(synchronous_success);
   EXPECT_FALSE(info.is_direct());
   EXPECT_EQ("foopy1", info.proxy_server().host_port_pair().host());
 
   // No request should have been queued.
   EXPECT_EQ(0u, resolver->pending_requests().size());
 }
 
 }  // namespace net