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

gpu/command_buffer/service/buffer_manager_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.
 
 #include "gpu/command_buffer/service/buffer_manager.h"
 #include "gpu/command_buffer/service/error_state_mock.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gpu_service_test.h"
 #include "gpu/command_buffer/service/mocks.h"
 #include "gpu/command_buffer/service/test_helper.h"
@@ skipping 15 matching lines @@
       const char* extensions) {
     GpuServiceTest::SetUp();
     if (feature_info) {
       TestHelper::SetupFeatureInfoInitExpectations(gl_.get(), extensions);
       feature_info->Initialize();
     }
     error_state_.reset(new MockErrorState());
     manager_.reset(new BufferManager(memory_tracker, feature_info));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     manager_->Destroy(false);
     manager_.reset();
     error_state_.reset();
     GpuServiceTest::TearDown();
   }
 
   GLenum GetTarget(const Buffer* buffer) const {
     return buffer->target();
   }
 
@@ skipping 24 matching lines @@
         error_state_.get(), buffer, offset, size, data);
     return success;
   }
 
   scoped_ptr<BufferManager> manager_;
   scoped_ptr<MockErrorState> error_state_;
 };
 
 class BufferManagerTest : public BufferManagerTestBase {
  protected:
-  virtual void SetUp() {
-    SetUpBase(NULL, NULL, "");
-  }
+  void SetUp() override { SetUpBase(NULL, NULL, ""); }
 };
 
 class BufferManagerMemoryTrackerTest : public BufferManagerTestBase {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     mock_memory_tracker_ = new StrictMock<MockMemoryTracker>();
     SetUpBase(mock_memory_tracker_.get(), NULL, "");
   }
 
   scoped_refptr<MockMemoryTracker> mock_memory_tracker_;
 };
 
 class BufferManagerClientSideArraysTest : public BufferManagerTestBase {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     feature_info_ = new FeatureInfo();
     feature_info_->workarounds_.use_client_side_arrays_for_stream_buffers =
       true;
     SetUpBase(NULL, feature_info_.get(), "");
   }
 
   scoped_refptr<FeatureInfo> feature_info_;
 };
 
 #define EXPECT_MEMORY_ALLOCATION_CHANGE(old_size, new_size, pool)   \
@@ skipping 305 matching lines @@
   DoBufferData(buffer, sizeof(data3), GL_STATIC_DRAW, data3, GL_NO_ERROR);
   EXPECT_TRUE(
       buffer->GetMaxValueForRange(0, 3, GL_UNSIGNED_INT, &max_value));
   EXPECT_EQ(30u, max_value);
 }
 
 }  // namespace gles2
 }  // namespace gpu