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

net/websockets/websocket_basic_stream_test.cc

 // Copyright 2013 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.
 //
 // Tests for WebSocketBasicStream. Note that we do not attempt to verify that
 // frame parsing itself functions correctly, as that is covered by the
 // WebSocketFrameParser tests.
 
 #include "net/websockets/websocket_basic_stream.h"
 
@@ skipping 92 matching lines @@
 
 // A fixture for tests which only perform normal socket operations.
 class WebSocketBasicStreamSocketTest : public WebSocketBasicStreamTest {
  protected:
   WebSocketBasicStreamSocketTest()
       : histograms_("a"),
         pool_(1, 1, &histograms_, &factory_),
         generator_(&GenerateNulMaskingKey),
         expect_all_io_to_complete_(true) {}
 
-  virtual ~WebSocketBasicStreamSocketTest() {
+  ~WebSocketBasicStreamSocketTest() override {
     // stream_ has a reference to socket_data_ (via MockTCPClientSocket) and so
     // should be destroyed first.
     stream_.reset();
   }
 
   scoped_ptr<ClientSocketHandle> MakeTransportSocket(MockRead reads[],
                                                      size_t reads_count,
                                                      MockWrite writes[],
                                                      size_t writes_count) {
     socket_data_.reset(new StrictStaticSocketDataProvider(
@@ skipping 106 matching lines @@
 
   scoped_ptr<MockRead[]> reads_;
 };
 
 // Test fixture for write tests.
 class WebSocketBasicStreamSocketWriteTest
     : public WebSocketBasicStreamSocketTest {
  protected:
   // All write tests use the same frame, so it is easiest to create it during
   // test creation.
-  virtual void SetUp() override { PrepareWriteFrame(); }
+  void SetUp() override { PrepareWriteFrame(); }
 
   // Creates a WebSocketFrame with a wire format matching kWriteFrame and adds
   // it to |frames_|.
   void PrepareWriteFrame() {
     scoped_ptr<WebSocketFrame> frame(
         new WebSocketFrame(WebSocketFrameHeader::kOpCodeText));
     const size_t payload_size =
         kWriteFrameSize - (WebSocketFrameHeader::kBaseHeaderSize +
                            WebSocketFrameHeader::kMaskingKeyLength);
     frame->data = new IOBuffer(payload_size);
@@ skipping 685 matching lines @@
 
 TEST_F(WebSocketBasicStreamSocketTest, GetSubProtocolWorks) {
   sub_protocol_ = "cyberchat";
   CreateNullStream();
 
   EXPECT_EQ("cyberchat", stream_->GetSubProtocol());
 }
 
 }  // namespace
 }  // namespace net