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

net/socket/socks5_client_socket_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/socket/socks5_client_socket.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 
@@ skipping 22 matching lines @@
   SOCKS5ClientSocketTest();
   // Create a SOCKSClientSocket on top of a MockSocket.
   scoped_ptr<SOCKS5ClientSocket> BuildMockSocket(MockRead reads[],
                                                  size_t reads_count,
                                                  MockWrite writes[],
                                                  size_t writes_count,
                                                  const std::string& hostname,
                                                  int port,
                                                  NetLog* net_log);
 
-  virtual void SetUp();
+  void SetUp() override;
 
  protected:
   const uint16 kNwPort;
   CapturingNetLog net_log_;
   scoped_ptr<SOCKS5ClientSocket> user_sock_;
   AddressList address_list_;
   // Filled in by BuildMockSocket() and owned by its return value
   // (which |user_sock| is set to).
   StreamSocket* tcp_sock_;
   TestCompletionCallback callback_;
@@ skipping 316 matching lines @@
     EXPECT_TRUE(user_sock_->IsConnected());
     net_log_.GetEntries(&net_log_entries);
     EXPECT_TRUE(LogContainsEndEvent(net_log_entries, -1,
                                     NetLog::TYPE_SOCKS5_CONNECT));
   }
 }
 
 }  // namespace
 
 }  // namespace net