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

net/socket_stream/socket_stream_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_stream/socket_stream.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 251 matching lines @@
   }
 
  private:
   int before_connect_result_;
 };
 
 }  // namespace
 
 class SocketStreamTest : public PlatformTest {
  public:
-  virtual ~SocketStreamTest() {}
-  virtual void SetUp() {
+  ~SocketStreamTest() override {}
+  void SetUp() override {
     mock_socket_factory_.reset();
     handshake_request_ = kWebSocketHandshakeRequest;
     handshake_response_ = kWebSocketHandshakeResponse;
   }
-  virtual void TearDown() {
-    mock_socket_factory_.reset();
-  }
+  void TearDown() override { mock_socket_factory_.reset(); }
 
   virtual void SetWebSocketHandshakeMessage(
       const char* request, const char* response) {
     handshake_request_ = request;
     handshake_response_ = response;
   }
   virtual void AddWebSocketMessage(const std::string& message) {
     messages_.push_back(message);
   }
 
@@ skipping 743 matching lines @@
 
   EXPECT_EQ(SocketStreamEvent::EVENT_START_OPEN_CONNECTION,
             events[0].event_type);
   EXPECT_EQ(SocketStreamEvent::EVENT_CONNECTED, events[1].event_type);
   EXPECT_EQ(SocketStreamEvent::EVENT_SENT_DATA, events[2].event_type);
   EXPECT_EQ(SocketStreamEvent::EVENT_RECEIVED_DATA, events[3].event_type);
   EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[4].event_type);
 }
 
 }  // namespace net