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

gpu/command_buffer/client/ring_buffer_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.
 
 // This file contains the tests for the RingBuffer class.
 
 #include "gpu/command_buffer/client/ring_buffer.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 40 matching lines @@
                 unsigned int arg_count,
                 const void* _args) {
     EXPECT_EQ(static_cast<unsigned int>(cmd::kSetToken), command);
     EXPECT_EQ(1u, arg_count);
     if (delay_set_token_)
       set_token_arguments_.push_back(_args);
     else
       api_mock_->SetToken(cmd::kSetToken, 1, _args);
   }
 
-  virtual void SetUp() {
+  void SetUp() override {
     delay_set_token_ = false;
     api_mock_.reset(new AsyncAPIMock(true));
     // ignore noops in the mock - we don't want to inspect the internals of the
     // helper.
     EXPECT_CALL(*api_mock_, DoCommand(cmd::kNoop, 0, _))
         .WillRepeatedly(Return(error::kNoError));
     // Forward the SetToken calls to the engine
     EXPECT_CALL(*api_mock_.get(), DoCommand(cmd::kSetToken, 1, _))
         .WillRepeatedly(DoAll(Invoke(this, &BaseRingBufferTest::SetToken),
                               Return(error::kNoError)));
@@ skipping 44 matching lines @@
 const unsigned int BaseRingBufferTest::kBaseOffset;
 const unsigned int BaseRingBufferTest::kBufferSize;
 #endif
 
 // Test fixture for RingBuffer test - Creates a RingBuffer, using a
 // CommandBufferHelper with a mock AsyncAPIInterface for its interface (calling
 // it directly, not through the RPC mechanism), making sure Noops are ignored
 // and SetToken are properly forwarded to the engine.
 class RingBufferTest : public BaseRingBufferTest {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     BaseRingBufferTest::SetUp();
 
     buffer_.reset(new int8[kBufferSize + kBaseOffset]);
     buffer_start_ = buffer_.get() + kBaseOffset;
     allocator_.reset(new RingBuffer(kAlignment, kBaseOffset, kBufferSize,
                                     helper_.get(), buffer_start_));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     // If the GpuScheduler posts any tasks, this forces them to run.
     base::MessageLoop::current()->RunUntilIdle();
 
     BaseRingBufferTest::TearDown();
   }
 
   scoped_ptr<RingBuffer> allocator_;
 };
 
 // Checks basic alloc and free.
@@ skipping 61 matching lines @@
   pointer = allocator_->Alloc(kAlloc2);
   EXPECT_EQ(kBufferSize - kAlloc1 - kAlloc2,
             allocator_->GetLargestFreeSizeNoWaiting());
   allocator_->FreePendingToken(pointer, helper_.get()->InsertToken());
   pointer = allocator_->Alloc(kBufferSize);
   EXPECT_EQ(0u, allocator_->GetLargestFreeSizeNoWaiting());
   allocator_->FreePendingToken(pointer, helper_.get()->InsertToken());
 }
 
 }  // namespace gpu