Split //ui/gl into //ui/gl + //ui/gi/init.

gpu/config/gpu_info_collector.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 "gpu/config/gpu_info_collector.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/trace_event/trace_event.h"
 #include "gpu/config/gpu_switches.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gl_version_info.h"
+#include "ui/gl/init/gl_factory.h"
 
 namespace {
 
 scoped_refptr<gfx::GLSurface> InitializeGLSurface() {
   scoped_refptr<gfx::GLSurface> surface(
-      gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size()));
+      gl::init::CreateOffscreenGLSurface(gfx::Size()));
   if (!surface.get()) {
     LOG(ERROR) << "gfx::GLContext::CreateOffscreenGLSurface failed";
     return NULL;
   }
 
   return surface;
 }
 
 scoped_refptr<gfx::GLContext> InitializeGLContext(gfx::GLSurface* surface) {
-
   scoped_refptr<gfx::GLContext> context(
-      gfx::GLContext::CreateGLContext(NULL,
-                                      surface,
-                                      gfx::PreferIntegratedGpu));
+      gl::init::CreateGLContext(nullptr, surface, gfx::PreferIntegratedGpu));
   if (!context.get()) {
-    LOG(ERROR) << "gfx::GLContext::CreateGLContext failed";
+    LOG(ERROR) << "gl::init::CreateGLContext failed";
     return NULL;
   }
 
   if (!context->MakeCurrent(surface)) {
     LOG(ERROR) << "gfx::GLContext::MakeCurrent() failed";
     return NULL;
   }
 
   return context;
 }
@@ skipping 224 matching lines @@
   for (size_t ii = 0; ii < gpu_info->secondary_gpus.size(); ++ii) {
     if (active_vendor_id == gpu_info->secondary_gpus[ii].vendor_id) {
       gpu_info->secondary_gpus[ii].active = true;
       return;
     }
   }
 }
 
 }  // namespace gpu