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

ui/gl/gpu_timing_unittest.cc

 // Copyright 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 <stdint.h>
 
 #include <memory>
 
 #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"
 #include "ui/gl/gpu_preference.h"
 #include "ui/gl/gpu_timing_fake.h"
 #include "ui/gl/init/gl_factory.h"
 #include "ui/gl/test/gl_surface_test_support.h"
 
 namespace gl {
 
@@ skipping 23 matching lines @@
     gpu_timing_fake_queries_.Reset();
   }
 
   void SetupGLContext(const char* gl_version, const char* gl_extensions) {
     ASSERT_FALSE(setup_) << "Cannot setup GL context twice.";
     SetGLGetProcAddressProc(MockGLInterface::GetGLProcAddress);
     GLSurfaceTestSupport::InitializeOneOffWithMockBindings();
     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());
     gpu_timing_fake_queries_.Reset();
 
     setup_ = true;
   }
 
   scoped_refptr<GPUTimingClient> CreateGPUTimingClient() {
     if (!setup_) {
       SetupGLContext("2.0", "");
     }
 
     scoped_refptr<GPUTimingClient> client = context_->CreateGPUTimingClient();
     if (!cpu_time_bounded_) {
       client->SetCpuTimeForTesting(base::Bind(&GPUTimingFake::GetFakeCPUTime));
       cpu_time_bounded_ = true;
     }
     return client;
   }
 
  protected:
   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_;
 };
 
 TEST_F(GPUTimingTest, FakeTimerTest) {
   scoped_refptr<GPUTimingClient> gpu_timing_client = CreateGPUTimingClient();
 
   // Tests that we can properly set fake cpu times.
   gpu_timing_fake_queries_.SetCurrentCPUTime(123);
   EXPECT_EQ(123, gpu_timing_client->GetCurrentCPUTime());
@@ skipping 113 matching lines @@
 
   int64_t start, end;
   gpu_timer->GetStartEndTimestamps(&start, &end);
   // Force time elapsed won't be set until a query is actually attempted
   ASSERT_TRUE(client->IsForceTimeElapsedQuery());
   EXPECT_EQ(begin_cpu_time, start);
   EXPECT_EQ(begin_cpu_time, end);
 }
 
 }  // namespace gl