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

gpu/command_buffer/client/query_tracker_unittest.cc

Index: gpu/command_buffer/client/query_tracker_unittest.cc
diff --git a/gpu/command_buffer/client/query_tracker_unittest.cc b/gpu/command_buffer/client/query_tracker_unittest.cc
index cd2ccf63297b37e7e3e392ef9d255de14e6d3b4f..53f51954059616792009ceadf2c4be180c0136f2 100644
--- a/gpu/command_buffer/client/query_tracker_unittest.cc
+++ b/gpu/command_buffer/client/query_tracker_unittest.cc
@@ -29,7 +29,7 @@ class QuerySyncManagerTest : public testing::Test {
   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);
@@ -38,7 +38,7 @@ class QuerySyncManagerTest : public testing::Test {
     sync_manager_.reset(new QuerySyncManager(mapped_memory_.get()));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     sync_manager_.reset();
     mapped_memory_.reset();
     helper_.reset();
@@ -83,7 +83,7 @@ class QueryTrackerTest : public testing::Test {
   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);
@@ -92,7 +92,7 @@ class QueryTrackerTest : public testing::Test {
     query_tracker_.reset(new QueryTracker(mapped_memory_.get()));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     query_tracker_.reset();
     mapped_memory_.reset();
     helper_.reset();