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

gpu/command_buffer/service/gpu_service_test.cc

Index: gpu/command_buffer/service/gpu_service_test.cc
diff --git a/gpu/command_buffer/service/gpu_service_test.cc b/gpu/command_buffer/service/gpu_service_test.cc
index 5781728ee2e4da2814cf5786b767591c2c8e033d..d91a81aaec9b349f937e9f266942f4416433292d 100644
--- a/gpu/command_buffer/service/gpu_service_test.cc
+++ b/gpu/command_buffer/service/gpu_service_test.cc
@@ -6,7 +6,7 @@
 
 #include "gpu/command_buffer/service/test_helper.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"
@@ -32,8 +32,8 @@ void GpuServiceTest::SetUpWithGLVersion(const char* gl_version,
   gl_.reset(new ::testing::StrictMock<::gl::MockGLInterface>());
   ::gl::MockGLInterface::SetGLInterface(gl_.get());
 
-  context_ = new gl::GLContextStubWithExtensions;
-  context_->AddExtensionsString(gl_extensions);
+  context_ = new gl::GLContextStub;
+  context_->SetExtensionsString(gl_extensions);
   context_->SetGLVersionString(gl_version);
   surface_ = new gl::GLSurfaceStub;
   context_->MakeCurrent(surface_.get());