Update from https://crrev.com/320931

gpu/command_buffer/service/gpu_tracer_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 <map>
 #include <set>
 
 #include "base/bind.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
 #include "gpu/command_buffer/service/gpu_service_test.h"
@@ skipping 43 matching lines @@
   void Reset() {
     current_time_ = 0;
     next_query_id_ = 23;
     alloced_queries_.clear();
     query_timestamp_.clear();
   }
 
   void SetCurrentGLTime(GLint64 current_time) { current_time_ = current_time; }
   void SetDisjoint() { disjointed_ = true; }
 
-  void GenQueriesARB(GLsizei n, GLuint* ids) {
+  void GenQueries(GLsizei n, GLuint* ids) {
     for (GLsizei i = 0; i < n; i++) {
       ids[i] = next_query_id_++;
       alloced_queries_.insert(ids[i]);
     }
   }
 
-  void DeleteQueriesARB(GLsizei n, const GLuint* ids) {
+  void DeleteQueries(GLsizei n, const GLuint* ids) {
     for (GLsizei i = 0; i < n; i++) {
       alloced_queries_.erase(ids[i]);
       query_timestamp_.erase(ids[i]);
     }
   }
 
-  void GetQueryObjectivARB(GLuint id, GLenum pname, GLint* params) {
+  void GetQueryObjectiv(GLuint id, GLenum pname, GLint* params) {
     switch (pname) {
       case GL_QUERY_RESULT_AVAILABLE: {
         std::map<GLuint, GLint64>::iterator it = query_timestamp_.find(id);
         if (it != query_timestamp_.end() && it->second <= current_time_)
           *params = 1;
         else
           *params = 0;
         break;
       }
       default:
-        FAIL() << "Invalid variable passed to GetQueryObjectivARB: " << pname;
+        FAIL() << "Invalid variable passed to GetQueryObjectiv: " << pname;
     }
   }
 
   void QueryCounter(GLuint id, GLenum target) {
     switch (target) {
       case GL_TIMESTAMP:
         ASSERT_TRUE(alloced_queries_.find(id) != alloced_queries_.end());
         query_timestamp_[id] = current_time_;
         break;
       default:
@@ skipping 130 matching lines @@
     outputter_ref_ = NULL;
 
     gl_fake_queries_.Reset();
     GpuServiceTest::TearDown();
   }
 
   void ExpectTraceQueryMocks() {
     if (gpu_timing_client_->IsAvailable() &&
         gpu_timing_client_->IsTimerOffsetAvailable()) {
       // Delegate query APIs used by GPUTrace to a GlFakeQueries
-      EXPECT_CALL(*gl_, GenQueriesARB(2, NotNull())).Times(AtLeast(1))
+      EXPECT_CALL(*gl_, GenQueries(2, NotNull())).Times(AtLeast(1))
           .WillRepeatedly(
-              Invoke(&gl_fake_queries_, &GlFakeQueries::GenQueriesARB));
+              Invoke(&gl_fake_queries_, &GlFakeQueries::GenQueries));
 
-      EXPECT_CALL(*gl_, GetQueryObjectivARB(_, GL_QUERY_RESULT_AVAILABLE,
+      EXPECT_CALL(*gl_, GetQueryObjectiv(_, GL_QUERY_RESULT_AVAILABLE,
                                             NotNull()))
           .WillRepeatedly(
-              Invoke(&gl_fake_queries_, &GlFakeQueries::GetQueryObjectivARB));
+              Invoke(&gl_fake_queries_, &GlFakeQueries::GetQueryObjectiv));
 
       EXPECT_CALL(*gl_, GetInteger64v(GL_TIMESTAMP, _))
           .WillRepeatedly(
               Invoke(&gl_fake_queries_, &GlFakeQueries::GetInteger64v));
 
       EXPECT_CALL(*gl_, QueryCounter(_, GL_TIMESTAMP)).Times(AtLeast(2))
           .WillRepeatedly(
                Invoke(&gl_fake_queries_, &GlFakeQueries::QueryCounter));
 
       EXPECT_CALL(*gl_, GetQueryObjectui64v(_, GL_QUERY_RESULT, NotNull()))
           .WillRepeatedly(
                Invoke(&gl_fake_queries_,
                       &GlFakeQueries::GetQueryObjectui64v));
 
-      EXPECT_CALL(*gl_, DeleteQueriesARB(2, NotNull())).Times(AtLeast(1))
+      EXPECT_CALL(*gl_, DeleteQueries(2, NotNull())).Times(AtLeast(1))
           .WillRepeatedly(
-               Invoke(&gl_fake_queries_, &GlFakeQueries::DeleteQueriesARB));
+               Invoke(&gl_fake_queries_, &GlFakeQueries::DeleteQueries));
     }
   }
 
   void ExpectOutputterBeginMocks(MockOutputter* outputter,
                                  const std::string& category,
                                  const std::string& name) {
     EXPECT_CALL(*outputter,
                 TraceServiceBegin(category, name));
   }
 
@@ skipping 423 matching lines @@
   scoped_refptr<gfx::GPUTimingClient>  client3 =
       GetGLContext()->CreateGPUTimingClient();
   ASSERT_TRUE(client1->CheckAndResetTimerErrors());
   ASSERT_TRUE(client2->CheckAndResetTimerErrors());
   ASSERT_FALSE(client3->CheckAndResetTimerErrors());
 }
 
 }  // namespace
 }  // namespace gles2
 }  // namespace gpu