| Index: ui/gl/gl_context.h
 | 
| diff --git a/ui/gl/gl_context.h b/ui/gl/gl_context.h
 | 
| index 542940c7683894bb857e311f97bbb53cf0102583..ebc98faa88667c0317ab0bcb8f8bf107d3458b3d 100644
 | 
| --- a/ui/gl/gl_context.h
 | 
| +++ b/ui/gl/gl_context.h
 | 
| @@ -33,12 +33,6 @@
 | 
|  class GPUTimingClient;
 | 
|  struct GLVersionInfo;
 | 
|  
 | 
| -struct GLContextAttribs {
 | 
| -  GpuPreference gpu_preference = PreferIntegratedGpu;
 | 
| -  bool bind_generates_resource = true;
 | 
| -  bool webgl_compatibility_context = false;
 | 
| -};
 | 
| -
 | 
|  // Encapsulates an OpenGL context, hiding platform specific management.
 | 
|  class GL_EXPORT GLContext : public base::RefCounted<GLContext> {
 | 
|   public:
 | 
| @@ -48,8 +42,8 @@
 | 
|    // context can be made with other surface's of the same type. The compatible
 | 
|    // surface is only needed for certain platforms like WGL, OSMesa and GLX. It
 | 
|    // should be specific for all platforms though.
 | 
| -  virtual bool Initialize(GLSurface* compatible_surface,
 | 
| -                          const GLContextAttribs& attribs) = 0;
 | 
| +  virtual bool Initialize(
 | 
| +      GLSurface* compatible_surface, GpuPreference gpu_preference) = 0;
 | 
|  
 | 
|    // Makes the GL context and a surface current on the current thread.
 | 
|    virtual bool MakeCurrent(GLSurface* surface) = 0;
 | 
| @@ -205,7 +199,7 @@
 | 
|  GL_EXPORT scoped_refptr<GLContext> InitializeGLContext(
 | 
|      scoped_refptr<GLContext> context,
 | 
|      GLSurface* compatible_surface,
 | 
| -    const GLContextAttribs& attribs);
 | 
| +    GpuPreference gpu_preference);
 | 
|  
 | 
|  }  // namespace gl
 | 
|  
 | 
| 
 |