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

net/socket/websocket_endpoint_lock_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 "net/socket/websocket_endpoint_lock_manager.h"
 
 #include "net/base/net_errors.h"
 #include "net/socket/next_proto.h"
 #include "net/socket/socket_test_util.h"
 #include "net/socket/stream_socket.h"
@@ skipping 75 matching lines @@
   bool called() const { return called_; }
 
  private:
   bool called_;
 };
 
 class WebSocketEndpointLockManagerTest : public ::testing::Test {
  protected:
   WebSocketEndpointLockManagerTest()
       : instance_(WebSocketEndpointLockManager::GetInstance()) {}
-  virtual ~WebSocketEndpointLockManagerTest() {
+  ~WebSocketEndpointLockManagerTest() override {
     // If this check fails then subsequent tests may fail.
     CHECK(instance_->IsEmpty());
   }
 
   WebSocketEndpointLockManager* instance() const { return instance_; }
 
   IPEndPoint DummyEndpoint() {
     IPAddressNumber ip_address_number;
     CHECK(ParseIPLiteralToNumber("127.0.0.1", &ip_address_number));
     return IPEndPoint(ip_address_number, 80);
@@ skipping 108 matching lines @@
   instance()->UnlockEndpoint(DummyEndpoint());
   EXPECT_TRUE(waiters[1].called());
   instance()->RememberSocket(&dummy_sockets[1], DummyEndpoint());
 
   UnlockDummyEndpoint(1);
 }
 
 }  // namespace
 
 }  // namespace net