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

ui/gl/test/gl_image_test_support.cc

 // Copyright 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 "ui/gl/test/gl_image_test_support.h"
 
 #include <vector>
 
 #include "ui/gl/gl_implementation.h"
-#include "ui/gl/init/gl_factory.h"
 #include "ui/gl/test/gl_surface_test_support.h"
 
 #if defined(USE_OZONE)
 #include "base/run_loop.h"
 #endif
 
 namespace gl {
 
 // static
 void GLImageTestSupport::InitializeGL() {
   std::vector<GLImplementation> allowed_impls;
   GetAllowedGLImplementations(&allowed_impls);
   DCHECK(!allowed_impls.empty());
 
   GLImplementation impl = allowed_impls[0];
   GLSurfaceTestSupport::InitializeOneOffImplementation(impl, true);
 #if defined(USE_OZONE)
   // Make sure all the tasks posted to the current task runner by the
   // initialization functions are run before running the tests.
   base::RunLoop().RunUntilIdle();
 #endif
 }
 
 // static
 void GLImageTestSupport::CleanupGL() {
-  init::ClearGLBindings();
+  ClearGLBindings();
 }
 
 // static
 void GLImageTestSupport::SetBufferDataToColor(int width,
                                               int height,
                                               int stride,
                                               int plane,
                                               gfx::BufferFormat format,
                                               const uint8_t color[4],
                                               uint8_t* data) {
@@ skipping 118 matching lines @@
     case gfx::BufferFormat::ETC1:
     case gfx::BufferFormat::RGBA_4444:
     case gfx::BufferFormat::UYVY_422:
       NOTREACHED();
       return;
   }
   NOTREACHED();
 }
 
 }  // namespace gl