Revert of Refactor context creation parameters into a struct.

ui/gl/gl_context_glx.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 "ui/gl/gl_context_glx.h"
 
 extern "C" {
 #include <X11/Xlib.h>
 }
 #include <memory>
@@ skipping 141 matching lines @@
 GLContextGLX::GLContextGLX(GLShareGroup* share_group)
   : GLContextReal(share_group),
     context_(nullptr),
     display_(nullptr) {
 }
 
 XDisplay* GLContextGLX::display() {
   return display_;
 }
 
-bool GLContextGLX::Initialize(GLSurface* compatible_surface,
-                              const GLContextAttribs& attribs) {
-  // webgl_compatibility_context and disabling bind_generates_resource are not
-  // supported.
-  DCHECK(!attribs.webgl_compatibility_context &&
-         attribs.bind_generates_resource);
-
+bool GLContextGLX::Initialize(
+    GLSurface* compatible_surface, GpuPreference gpu_preference) {
   display_ = static_cast<XDisplay*>(compatible_surface->GetDisplay());
 
   GLXContext share_handle = static_cast<GLXContext>(
       share_group() ? share_group()->GetHandle() : nullptr);
 
   if (GLSurfaceGLX::IsCreateContextSupported()) {
     DVLOG(1) << "GLX_ARB_create_context supported.";
     if (base::CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kCreateDefaultGLContext)) {
       context_ = CreateContextAttribs(
@@ skipping 145 matching lines @@
 
 bool GLContextGLX::WasAllocatedUsingRobustnessExtension() {
   return GLSurfaceGLX::IsCreateContextRobustnessSupported();
 }
 
 GLContextGLX::~GLContextGLX() {
   Destroy();
 }
 
 }  // namespace gl