Update from https://crrev.com/309717

net/quic/quic_stream_factory_test.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/quic/quic_stream_factory.h"
 
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "net/base/test_data_directory.h"
 #include "net/cert/cert_verifier.h"
@@ skipping 88 matching lines @@
   static void SetLoadServerInfoTimeout(QuicStreamFactory* factory,
                                        size_t load_server_info_timeout) {
     factory->load_server_info_timeout_ms_ = load_server_info_timeout;
   }
 };
 
 class MockQuicServerInfo : public QuicServerInfo {
  public:
   MockQuicServerInfo(const QuicServerId& server_id)
       : QuicServerInfo(server_id) {}
-  virtual ~MockQuicServerInfo() {}
+  ~MockQuicServerInfo() override {}
 
-  virtual void Start() override {};
+  void Start() override {}
 
-  virtual int WaitForDataReady(const CompletionCallback& callback) override {
+  int WaitForDataReady(const CompletionCallback& callback) override {
     return ERR_IO_PENDING;
   }
 
-  virtual void CancelWaitForDataReadyCallback() override {}
+  void CancelWaitForDataReadyCallback() override {}
 
-  virtual bool IsDataReady() override { return false; }
+  bool IsDataReady() override { return false; }
 
-  virtual bool IsReadyToPersist() override { return false; }
+  bool IsReadyToPersist() override { return false; }
 
-  virtual void Persist() override {};
+  void Persist() override {}
 
-  virtual void OnExternalCacheHit() override {};
+  void OnExternalCacheHit() override {}
 };
 
 class MockQuicServerInfoFactory : public QuicServerInfoFactory {
  public:
   MockQuicServerInfoFactory() {}
-  virtual ~MockQuicServerInfoFactory() {}
+  ~MockQuicServerInfoFactory() override {}
 
-  virtual QuicServerInfo* GetForServer(const QuicServerId& server_id) override {
+  QuicServerInfo* GetForServer(const QuicServerId& server_id) override {
     return new MockQuicServerInfo(server_id);
   }
 };
 
 
 class QuicStreamFactoryTest : public ::testing::TestWithParam<QuicVersion> {
  protected:
   QuicStreamFactoryTest()
       : random_generator_(0),
         clock_(new MockClock()),
@@ skipping 1454 matching lines @@
   ASSERT_EQ(0u, runner_->GetPostedTasks().size());
 
   scoped_ptr<QuicHttpStream> stream = request.ReleaseStream();
   EXPECT_TRUE(stream.get());
   EXPECT_TRUE(socket_data.at_read_eof());
   EXPECT_TRUE(socket_data.at_write_eof());
 }
 
 }  // namespace test
 }  // namespace net