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

gpu/ipc/service/gpu_channel_unittest.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 <stdint.h>
 
 #include "base/memory/shared_memory.h"
 #include "base/test/test_message_loop.h"
 #include "gpu/ipc/common/gpu_messages.h"
 #include "gpu/ipc/service/gpu_channel.h"
 #include "gpu/ipc/service/gpu_channel_manager.h"
 #include "gpu/ipc/service/gpu_channel_test_common.h"
 #include "ipc/ipc_test_sink.h"
-#include "ui/gl/gl_context_stub_with_extensions.h"
-#include "ui/gl/gl_stub_api.h"
 #include "ui/gl/gl_surface_stub.h"
 #include "ui/gl/init/gl_factory.h"
 #include "ui/gl/test/gl_surface_test_support.h"
 
 namespace gpu {
 
 class GpuChannelTest : public GpuChannelTestCommon {
  public:
   GpuChannelTest() : GpuChannelTestCommon() {}
   ~GpuChannelTest() override {}
 
   void SetUp() override {
     // We need GL bindings to actually initialize command buffers.
-    gl::GLSurfaceTestSupport::InitializeOneOffWithMockBindings();
-    gl::SetStubGLApi(&api_);
+    gl::GLSurfaceTestSupport::InitializeOneOffWithStubBindings();
 
     GpuChannelTestCommon::SetUp();
   }
 
   void TearDown() override {
     GpuChannelTestCommon::TearDown();
 
     gl::init::ShutdownGL();
   }
 
@@ skipping 41 matching lines @@
     base::SharedMemory shared_memory;
     shared_memory.CreateAnonymous(10);
     base::SharedMemoryHandle shmem_handle;
     shared_memory.ShareToProcess(base::GetCurrentProcessHandle(),
                                  &shmem_handle);
     return shmem_handle;
   }
 
  private:
   base::TestMessageLoop message_loop_;
-  gl::GLStubApi api_;
 };
 
 #if defined(OS_WIN)
 const SurfaceHandle kFakeSurfaceHandle = reinterpret_cast<SurfaceHandle>(1);
 #else
 const SurfaceHandle kFakeSurfaceHandle = 1;
 #endif
 
 TEST_F(GpuChannelTest, CreateViewCommandBufferAllowed) {
   int32_t kClientId = 1;
@@ skipping 299 matching lines @@
   EXPECT_TRUE(channel->LookupCommandBuffer(kSharedRouteId));
 
   // Destroy the command buffers we initialized before destoying GL.
   HandleMessage(channel,
                 new GpuChannelMsg_DestroyCommandBuffer(kFriendlyRouteId));
   HandleMessage(channel,
                 new GpuChannelMsg_DestroyCommandBuffer(kSharedRouteId));
 }
 
 }  // namespace gpu