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

net/socket_stream/socket_stream_unittest.cc

Index: net/socket_stream/socket_stream_unittest.cc
diff --git a/net/socket_stream/socket_stream_unittest.cc b/net/socket_stream/socket_stream_unittest.cc
index 6d47086a9e69327c8206a59b8410183b0b5d0ccb..b5ee002ed56e81251b3fe07bc1e010fbf0784d85 100644
--- a/net/socket_stream/socket_stream_unittest.cc
+++ b/net/socket_stream/socket_stream_unittest.cc
@@ -269,15 +269,13 @@ class TestSocketStreamNetworkDelegate : public TestNetworkDelegate {
 
 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) {