Refactor GL bindings so there is no global GLApi or DriverGL.

ui/gl/gpu_timing_unittest.cc

Index: ui/gl/gpu_timing_unittest.cc
diff --git a/ui/gl/gpu_timing_unittest.cc b/ui/gl/gpu_timing_unittest.cc
index c895a7dbbf79acb67fbde2d2411b56c40d92fb9c..6fa9b06f7e1d46f4b844ebf8593735fbb9374e82 100644
--- a/ui/gl/gpu_timing_unittest.cc
+++ b/ui/gl/gpu_timing_unittest.cc
@@ -10,7 +10,7 @@
 
 #include "base/bind.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gl/gl_context_stub_with_extensions.h"
+#include "ui/gl/gl_context_stub.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_mock.h"
 #include "ui/gl/gl_surface_stub.h"
@@ -54,8 +54,8 @@ class GPUTimingTest : public testing::Test {
     gl_.reset(new ::testing::StrictMock<MockGLInterface>());
     MockGLInterface::SetGLInterface(gl_.get());
 
-    context_ = new GLContextStubWithExtensions;
-    context_->AddExtensionsString(gl_extensions);
+    context_ = new GLContextStub;
+    context_->SetExtensionsString(gl_extensions);
     context_->SetGLVersionString(gl_version);
     surface_ = new GLSurfaceStub;
     context_->MakeCurrent(surface_.get());
@@ -81,7 +81,7 @@ class GPUTimingTest : public testing::Test {
   bool setup_ = false;
   bool cpu_time_bounded_ = false;
   std::unique_ptr<::testing::StrictMock<MockGLInterface>> gl_;
-  scoped_refptr<GLContextStubWithExtensions> context_;
+  scoped_refptr<GLContextStub> context_;
   scoped_refptr<GLSurfaceStub> surface_;
   GPUTimingFake gpu_timing_fake_queries_;
 };