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

net/tools/flip_server/http_interface_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.
 
 #include "net/tools/flip_server/http_interface.h"
 
 #include <list>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
@@ skipping 68 matching lines @@
                                            memory_cache_.get(),
                                            acceptor_.get(),
                                            "log_prefix"));
 
     interface_.reset(new HttpSM(connection_.get(),
                                 mock_another_interface_.get(),
                                 memory_cache_.get(),
                                 acceptor_.get()));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     if (acceptor_->listen_fd_ >= 0) {
       epoll_server_->UnregisterFD(acceptor_->listen_fd_);
       close(acceptor_->listen_fd_);
       acceptor_->listen_fd_ = -1;
     }
     STLDeleteElements(connection_->output_list());
   }
 
   bool HasStream(uint32 stream_id) {
     return interface_->output_ordering().ExistsInPriorityMaps(stream_id);
   }
 
  protected:
   scoped_ptr<MockSMInterface> mock_another_interface_;
   scoped_ptr<MemoryCache> memory_cache_;
   scoped_ptr<FlipAcceptor> acceptor_;
   scoped_ptr<EpollServer> epoll_server_;
   scoped_ptr<MockSMConnection> connection_;
   scoped_ptr<HttpSM> interface_;
 };
 
 class FlipHttpSMProxyTest : public FlipHttpSMTest {
  public:
   FlipHttpSMProxyTest() : FlipHttpSMTest(FLIP_HANDLER_PROXY) {}
-  virtual ~FlipHttpSMProxyTest() {}
+  ~FlipHttpSMProxyTest() override {}
 };
 
 class FlipHttpSMHttpTest : public FlipHttpSMTest {
  public:
   FlipHttpSMHttpTest() : FlipHttpSMTest(FLIP_HANDLER_HTTP_SERVER) {}
-  virtual ~FlipHttpSMHttpTest() {}
+  ~FlipHttpSMHttpTest() override {}
 };
 
 class FlipHttpSMSpdyTest : public FlipHttpSMTest {
  public:
   FlipHttpSMSpdyTest() : FlipHttpSMTest(FLIP_HANDLER_SPDY_SERVER) {}
-  virtual ~FlipHttpSMSpdyTest() {}
+  ~FlipHttpSMSpdyTest() override {}
 };
 
 TEST_F(FlipHttpSMTest, Construct) {
   ASSERT_FALSE(interface_->spdy_framer()->is_request());
 }
 
 TEST_F(FlipHttpSMTest, AddToOutputOrder) {
   uint32 stream_id = 13;
   MemCacheIter mci;
   mci.stream_id = stream_id;
@@ skipping 345 matching lines @@
   }
   interface_->SendEOF(32);
   ASSERT_EQ(1u, connection_->output_list()->size());
   DataFrame* df = connection_->output_list()->front();
   ASSERT_EQ("0\r\n\r\n", StringPiece(df->data, df->size));
 }
 
 }  // namespace
 
 }  // namespace net