Update from https://crrev.com/320931

ui/gl/gpu_timing.cc

 // Copyright (c) 2015 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 "ui/gl/gpu_timing.h"
 
 #include "base/time/time.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_version_info.h"
@@ skipping 26 matching lines @@
     GLint disjoint_value = 0;
     glGetIntegerv(GL_GPU_DISJOINT_EXT, &disjoint_value);
     if (disjoint_value) {
       disjoint_counter_++;
     }
   }
   return disjoint_counter_;
 }
 
 GPUTimer::~GPUTimer() {
-  glDeleteQueriesARB(2, queries_);
+  glDeleteQueries(2, queries_);
 }
 
 void GPUTimer::Start() {
   switch (gpu_timing_client_->gpu_timing_->timer_type_) {
     case GPUTiming::kTimerTypeARB:
     case GPUTiming::kTimerTypeDisjoint:
       // GL_TIMESTAMP and GL_TIMESTAMP_EXT both have the same value.
       glQueryCounter(queries_[0], GL_TIMESTAMP);
       break;
     case GPUTiming::kTimerTypeEXT:
@@ skipping 19 matching lines @@
     default:
       NOTREACHED();
   }
 }
 
 bool GPUTimer::IsAvailable() {
   if (!gpu_timing_client_->IsAvailable() || !end_requested_) {
     return false;
   }
   GLint done = 0;
-  glGetQueryObjectivARB(queries_[1] ? queries_[1] : queries_[0],
-                        GL_QUERY_RESULT_AVAILABLE, &done);
+  glGetQueryObjectiv(queries_[1] ? queries_[1] : queries_[0],
+                     GL_QUERY_RESULT_AVAILABLE, &done);
   return done != 0;
 }
 
 void GPUTimer::GetStartEndTimestamps(int64* start, int64* end) {
   DCHECK(start && end);
   DCHECK(IsAvailable());
   DCHECK(gpu_timing_client_->gpu_timing_);
   DCHECK(gpu_timing_client_->gpu_timing_->timer_type_ !=
          GPUTiming::kTimerTypeEXT);
   GLuint64 begin_stamp = 0;
@@ skipping 39 matching lines @@
     case GPUTiming::kTimerTypeARB:
     case GPUTiming::kTimerTypeDisjoint:
       queries = 2;
       break;
     case GPUTiming::kTimerTypeEXT:
       queries = 1;
       break;
     default:
       NOTREACHED();
   }
-  glGenQueriesARB(queries, queries_);
+  glGenQueries(queries, queries_);
 }
 
 GPUTimingClient::GPUTimingClient(GPUTiming* gpu_timing)
     : gpu_timing_(gpu_timing) {
   if (gpu_timing) {
     timer_type_ = gpu_timing->GetTimerType();
     disjoint_counter_ = gpu_timing_->GetDisjointCount();
   }
 }
 
@@ skipping 55 matching lines @@
 
 void GPUTimingClient::SetCpuTimeForTesting(
     const base::Callback<int64(void)>& cpu_time) {
   cpu_time_for_testing_ = cpu_time;
 }
 
 GPUTimingClient::~GPUTimingClient() {
 }
 
 }  // namespace gfx