Split EGLContext in GLContextEGL and GLSurfaceEGL.

content/gpu/gpu_info_collector_win.cc

 // Copyright (c) 2011 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 "content/gpu/gpu_info_collector.h"
 
 #include <d3d9.h>
 #include <setupapi.h>
 #include <windows.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_native_library.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
-#include "ui/gfx/gl/gl_context_egl.h"
 #include "ui/gfx/gl/gl_implementation.h"
+#include "ui/gfx/gl/gl_surface_egl.h"
 
 // ANGLE seems to require that main.h be included before any other ANGLE header.
 #include "libEGL/main.h"
 #include "libEGL/Display.h"
 
 namespace {
 
 // The version number stores the major and minor version in the least 16 bits;
 // for example, 2.5 is 0x00000205.
 // Returned string is in the format of "major.minor".
@@ skipping 37 matching lines @@
 
   if (gfx::GetGLImplementation() != gfx::kGLImplementationEGLGLES2) {
     gpu_info->finalized = true;
     return CollectGraphicsInfoGL(gpu_info);
   }
 
   // TODO(zmo): the following code only works if running on top of ANGLE.
   // Need to handle the case when running on top of real EGL/GLES2 drivers.
 
   egl::Display* display = static_cast<egl::Display*>(
-      gfx::BaseEGLContext::GetDisplay());
+      gfx::GLSurfaceEGL::GetDisplay());
   if (!display) {
     LOG(ERROR) << "gfx::BaseEGLContext::GetDisplay() failed";
     return false;
   }
 
   IDirect3DDevice9* device = display->getDevice();
   if (!device) {
     LOG(ERROR) << "display->getDevice() failed";
     return false;
   }
@@ skipping 179 matching lines @@
 
   size_t pos = gl_version_string.find_last_not_of("0123456789.");
   if (pos != std::string::npos && pos < gl_version_string.length() - 1) {
     gpu_info->driver_version = gl_version_string.substr(pos + 1);
     return true;
   }
   return false;
 }
 
 }  // namespace gpu_info_collector