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

gpu/command_buffer/client/query_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 QueryTracker.
 
 #include "gpu/command_buffer/client/query_tracker.h"
 
 #include <GLES2/gl2ext.h>
 #include "base/memory/scoped_ptr.h"
@@ skipping 11 matching lines @@
 void EmptyPoll() {
 }
 }
 
 class QuerySyncManagerTest : 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 MockClientCommandBuffer());
     helper_.reset(new GLES2CmdHelper(command_buffer_.get()));
     helper_->Initialize(kCommandBufferSizeBytes);
     mapped_memory_.reset(new MappedMemoryManager(
         helper_.get(), base::Bind(&EmptyPoll), MappedMemoryManager::kNoLimit));
     sync_manager_.reset(new QuerySyncManager(mapped_memory_.get()));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     sync_manager_.reset();
     mapped_memory_.reset();
     helper_.reset();
     command_buffer_.reset();
   }
 
   scoped_ptr<CommandBuffer> command_buffer_;
   scoped_ptr<GLES2CmdHelper> helper_;
   scoped_ptr<MappedMemoryManager> mapped_memory_;
   scoped_ptr<QuerySyncManager> sync_manager_;
@@ skipping 24 matching lines @@
     EXPECT_TRUE(sync_manager_->Alloc(&infos[ii]));
   }
 }
 
 class QueryTrackerTest : 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 MockClientCommandBuffer());
     helper_.reset(new GLES2CmdHelper(command_buffer_.get()));
     helper_->Initialize(kCommandBufferSizeBytes);
     mapped_memory_.reset(new MappedMemoryManager(
         helper_.get(), base::Bind(&EmptyPoll), MappedMemoryManager::kNoLimit));
     query_tracker_.reset(new QueryTracker(mapped_memory_.get()));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     query_tracker_.reset();
     mapped_memory_.reset();
     helper_.reset();
     command_buffer_.reset();
   }
 
   QuerySync* GetSync(QueryTracker::Query* query) {
     return query->info_.sync;
   }
 
@@ skipping 123 matching lines @@
 
   // Check FreeCompletedQueries.
   query_tracker_->FreeCompletedQueries();
   EXPECT_EQ(0u, bucket->used_query_count);
 }
 
 }  // namespace gles2
 }  // namespace gpu