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

gpu/command_buffer/client/buffer_tracker_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.
 
 // Tests for the BufferTracker.
 
 #include "gpu/command_buffer/client/buffer_tracker.h"
 
 #include <GLES2/gl2ext.h>
 #include "base/memory/scoped_ptr.h"
@@ skipping 35 matching lines @@
 void EmptyPoll() {
 }
 }
 
 class BufferTrackerTest : public testing::Test {
  protected:
   static const int32 kNumCommandEntries = 400;
   static const int32 kCommandBufferSizeBytes =
       kNumCommandEntries * sizeof(CommandBufferEntry);
 
-  virtual void SetUp() {
+  void SetUp() override {
     command_buffer_.reset(new MockClientCommandBufferImpl());
     helper_.reset(new GLES2CmdHelper(command_buffer_.get()));
     helper_->Initialize(kCommandBufferSizeBytes);
     mapped_memory_.reset(new MappedMemoryManager(
         helper_.get(), base::Bind(&EmptyPoll), MappedMemoryManager::kNoLimit));
     buffer_tracker_.reset(new BufferTracker(mapped_memory_.get()));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     buffer_tracker_.reset();
     mapped_memory_.reset();
     helper_.reset();
     command_buffer_.reset();
   }
 
   scoped_ptr<MockClientCommandBufferImpl> command_buffer_;
   scoped_ptr<GLES2CmdHelper> helper_;
   scoped_ptr<MappedMemoryManager> mapped_memory_;
   scoped_ptr<BufferTracker> buffer_tracker_;
@@ skipping 68 matching lines @@
   buffer_tracker_->Unmanage(buffer);
   buffer_tracker_->RemoveBuffer(kId);
   EXPECT_EQ(mapped_memory_->bytes_in_use(), static_cast<size_t>(size));
 
   mapped_memory_->Free(mem);
   EXPECT_EQ(mapped_memory_->bytes_in_use(), static_cast<size_t>(0));
 }
 
 }  // namespace gles2
 }  // namespace gpu