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

gpu/command_buffer/tests/gl_query_unittest.cc

 // Copyright 2014 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 <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 
 #include "base/threading/platform_thread.h"
 #include "gpu/command_buffer/tests/gl_manager.h"
 #include "gpu/command_buffer/tests/gl_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gpu {
 
 class QueryTest : public testing::Test {
  protected:
-  virtual void SetUp() {
-    gl_.Initialize(GLManager::Options());
-  }
+  void SetUp() override { gl_.Initialize(GLManager::Options()); }
 
-  virtual void TearDown() {
-    gl_.Destroy();
-  }
+  void TearDown() override { gl_.Destroy(); }
 
   GLManager gl_;
 };
 
 TEST_F(QueryTest, MultipleQueries) {
   EXPECT_TRUE(GLTestHelper::HasExtension("GL_CHROMIUM_get_error_query"));
   EXPECT_TRUE(GLTestHelper::HasExtension(
                   "GL_CHROMIUM_command_buffer_latency_query"));
 
   GLuint error_query = 0;
@@ skipping 150 matching lines @@
   GLuint result = 0;
   glGetQueryObjectuivEXT(query, GL_QUERY_RESULT_AVAILABLE_EXT, &result);
   EXPECT_EQ(1u, result);
   glDeleteQueriesEXT(1, &query);
   GLTestHelper::CheckGLError("no errors", __LINE__);
 }
 
 }  // namespace gpu