Make dynamic mock bindings initialization consistent with other GL implementations

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"
@@ skipping 100 matching lines @@
             SetArrayArgument<1>(kFakeTextureIds, kFakeTextureIds + 1));
     EXPECT_CALL(*gl_interface_, GenTextures(2, NotNull()))
         .Times(AnyNumber())
         .WillRepeatedly(
             SetArrayArgument<1>(kFakeTextureIds, kFakeTextureIds + 2));
     // And errors should be squashed.
     EXPECT_CALL(*gl_interface_, CheckFramebufferStatusEXT(GL_FRAMEBUFFER))
         .Times(AnyNumber())
         .WillRepeatedly(Return(GL_FRAMEBUFFER_COMPLETE));
 
-    // Dynamic bindings must be set up for the GLES2DecoderImpl, which requires
-    // a GLContext. Use a GLContextStub which does nothing but call through to
-    // our |gl_interface| above.
-    stub_context_ = new gl::GLContextStub;
-    stub_surface_ = new gl::GLSurfaceStub;
-    stub_context_->MakeCurrent(stub_surface_.get());
-    gl::GLSurfaceTestSupport::InitializeDynamicMockBindings(
-        stub_context_.get());
-
     GpuChannelTestCommon::SetUp();
   }
 
   void TearDown() override {
     GpuChannelTestCommon::TearDown();
 
-    stub_context_ = nullptr;
-    stub_surface_ = nullptr;
     gl::MockGLInterface::SetGLInterface(nullptr);
     gl::init::ClearGLBindings();
     gl_interface_ = nullptr;
   }
 
   GpuChannel* CreateChannel(int32_t client_id,
                             bool allow_view_command_buffers,
                             bool allow_real_time_streams) {
     DCHECK(channel_manager());
     uint64_t kClientTracingId = 1;
@@ skipping 37 matching lines @@
     shared_memory.CreateAnonymous(10);
     base::SharedMemoryHandle shmem_handle;
     shared_memory.ShareToProcess(base::GetCurrentProcessHandle(),
                                  &shmem_handle);
     return shmem_handle;
   }
 
  private:
   base::TestMessageLoop message_loop_;
   std::unique_ptr<gl::MockGLInterface> gl_interface_;
-  scoped_refptr<gl::GLContextStub> stub_context_;
-  scoped_refptr<gl::GLSurfaceStub> stub_surface_;
 };
 
 #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