Revert of Move static GL binding initialization to //ui/gl/init.

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_mock.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 {
 
 static constexpr int kFakeTextureIds[] = {1, 2};
 
 class GpuChannelTest : public GpuChannelTestCommon {
  public:
   GpuChannelTest() : GpuChannelTestCommon() {}
   ~GpuChannelTest() override {}
@@ skipping 101 matching lines @@
 
     GpuChannelTestCommon::SetUp();
   }
 
   void TearDown() override {
     GpuChannelTestCommon::TearDown();
 
     stub_context_ = nullptr;
     stub_surface_ = nullptr;
     gl::MockGLInterface::SetGLInterface(nullptr);
-    gl::init::ClearGLBindings();
+    gl::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;
     channel_manager()->EstablishChannel(
         client_id, kClientTracingId, false /* preempts */,
@@ skipping 378 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