Update from https://crrev.com/309415

net/http/http_network_transaction_unittest.cc

Index: net/http/http_network_transaction_unittest.cc
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index a0248fe21267c70b1f1a6116ed6efae0f03f5f02..19dfeb7e7063f848e0ccb206afdbc796663dbc93 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -516,32 +516,30 @@ class CaptureGroupNameSocketPool : public ParentPool {
     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 {
-    return 0;
-  }
-  virtual int IdleSocketCountInGroup(const std::string& group_name) 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 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();
   }