Update from https://crrev.com/309415

net/http/http_network_transaction_unittest.cc

 // Copyright 2013 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/http/http_network_transaction.h"
 
 #include <math.h>  // ceil
 #include <stdarg.h>
 #include <string>
 #include <vector>
@@ skipping 498 matching lines @@
 template<typename ParentPool>
 class CaptureGroupNameSocketPool : public ParentPool {
  public:
   CaptureGroupNameSocketPool(HostResolver* host_resolver,
                              CertVerifier* cert_verifier);
 
   const std::string last_group_name_received() const {
     return last_group_name_;
   }
 
-  virtual int RequestSocket(const std::string& group_name,
-                            const void* socket_params,
-                            RequestPriority priority,
-                            ClientSocketHandle* handle,
-                            const CompletionCallback& callback,
-                            const BoundNetLog& net_log) {
+  int RequestSocket(const std::string& group_name,
+                    const void* socket_params,
+                    RequestPriority priority,
+                    ClientSocketHandle* handle,
+                    const CompletionCallback& callback,
+                    const BoundNetLog& net_log) override {
     last_group_name_ = group_name;
     return ERR_IO_PENDING;
   }
-  virtual void CancelRequest(const std::string& group_name,
-                             ClientSocketHandle* handle) {}
-  virtual void ReleaseSocket(const std::string& group_name,
-                             scoped_ptr<StreamSocket> socket,
-                             int id) {}
-  virtual void CloseIdleSockets() {}
-  virtual int IdleSocketCount() const {
+  void CancelRequest(const std::string& group_name,
+                     ClientSocketHandle* handle) override {}
+  void ReleaseSocket(const std::string& group_name,
+                     scoped_ptr<StreamSocket> socket,
+                     int id) override {}
+  void CloseIdleSockets() override {}
+  int IdleSocketCount() const override { return 0; }
+  int IdleSocketCountInGroup(const std::string& group_name) const override {
     return 0;
   }
-  virtual int IdleSocketCountInGroup(const std::string& group_name) const {
-    return 0;
-  }
-  virtual LoadState GetLoadState(const std::string& group_name,
-                                 const ClientSocketHandle* handle) const {
+  LoadState GetLoadState(const std::string& group_name,
+                         const ClientSocketHandle* handle) const override {
     return LOAD_STATE_IDLE;
   }
-  virtual base::TimeDelta ConnectionTimeout() const {
+  base::TimeDelta ConnectionTimeout() const override {
     return base::TimeDelta();
   }
 
  private:
   std::string last_group_name_;
 };
 
 typedef CaptureGroupNameSocketPool<TransportClientSocketPool>
 CaptureGroupNameTransportSocketPool;
 typedef CaptureGroupNameSocketPool<HttpProxyClientSocketPool>
@@ skipping 12632 matching lines @@
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
   EXPECT_EQ(ERR_CONNECTION_RESET, rv);
 
   const HttpResponseInfo* response = trans->GetResponseInfo();
   EXPECT_TRUE(response == NULL);
 }
 
 }  // namespace net