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

gpu/config/gpu_info_collector_unittest.cc

 // Copyright (c) 2012 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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/strings/string_split.h"
 #include "gpu/config/gpu_info.h"
 #include "gpu/config/gpu_info_collector.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_mock.h"
-#include "ui/gl/init/gl_factory.h"
 #include "ui/gl/test/gl_surface_test_support.h"
 
 using ::gl::MockGLInterface;
 using ::testing::Return;
 using ::testing::SetArgPointee;
 using ::testing::_;
 
 namespace {
 
 // Allows testing of all configurations on all operating systems.
@@ skipping 133 matching lines @@
         .WillRepeatedly(Return(reinterpret_cast<const GLubyte*>(
             test_values_.gl_renderer.c_str())));
     EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_SAMPLES, _))
         .WillOnce(SetArgPointee<1>(8))
         .RetiresOnSaturation();
   }
 
   void TearDown() override {
     ::gl::MockGLInterface::SetGLInterface(NULL);
     gl_.reset();
-    gl::init::ClearGLBindings();
+    gl::ClearGLBindings();
 
     testing::Test::TearDown();
   }
 
  public:
   // Use StrictMock to make 100% sure we know how GL will be called.
   std::unique_ptr<::testing::StrictMock<::gl::MockGLInterface>> gl_;
   GPUInfo test_values_;
   const char* gl_shading_language_version_ = nullptr;
 
@@ skipping 172 matching lines @@
 
   gpu_info.gl_vendor = "Google Corporation";
   gpu_info.gl_renderer = "Chrome GPU Team";
   IdentifyActiveGPU(&gpu_info);
   EXPECT_FALSE(gpu_info.gpu.active);
   EXPECT_FALSE(gpu_info.secondary_gpus[0].active);
 }
 
 }  // namespace gpu