| Index: ui/gl/gl_surface_egl.cc
 | 
| diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc
 | 
| index 3e4243b2dac22e9e63a56f149eac214e403eb16a..1d5c1409980618730e2f732cfd15b916bfeab6c6 100644
 | 
| --- a/ui/gl/gl_surface_egl.cc
 | 
| +++ b/ui/gl/gl_surface_egl.cc
 | 
| @@ -134,7 +134,6 @@
 | 
|  bool g_egl_window_fixed_size_supported = false;
 | 
|  bool g_egl_surfaceless_context_supported = false;
 | 
|  bool g_egl_surface_orientation_supported = false;
 | 
| -bool g_egl_context_priority_supported = false;
 | 
|  bool g_use_direct_composition = false;
 | 
|  
 | 
|  base::LazyInstance<ANGLEPlatformImpl> g_angle_platform_impl =
 | 
| @@ -243,7 +242,6 @@
 | 
|  EGLConfig ChooseConfig(GLSurfaceFormat format) {
 | 
|    // Choose an EGL configuration.
 | 
|    // On X this is only used for PBuffer surfaces.
 | 
| -
 | 
|    std::vector<EGLint> renderable_types;
 | 
|    if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
 | 
|            switches::kDisableES3GLContext)) {
 | 
| @@ -254,9 +252,6 @@
 | 
|    EGLint buffer_size = format.GetBufferSize();
 | 
|    EGLint alpha_size = 8;
 | 
|    bool want_rgb565 = buffer_size == 16;
 | 
| -  EGLint depth_size = format.GetDepthBits();
 | 
| -  EGLint stencil_size = format.GetStencilBits();
 | 
| -  EGLint samples = format.GetSamples();
 | 
|  
 | 
|  #if defined(USE_X11) && !defined(OS_CHROMEOS)
 | 
|    // If we're using ANGLE_NULL, we may not have a display, in which case we
 | 
| @@ -283,12 +278,6 @@
 | 
|                                      8,
 | 
|                                      EGL_RED_SIZE,
 | 
|                                      8,
 | 
| -                                    EGL_SAMPLES,
 | 
| -                                    samples,
 | 
| -                                    EGL_DEPTH_SIZE,
 | 
| -                                    depth_size,
 | 
| -                                    EGL_STENCIL_SIZE,
 | 
| -                                    stencil_size,
 | 
|                                      EGL_RENDERABLE_TYPE,
 | 
|                                      renderable_type,
 | 
|                                      EGL_SURFACE_TYPE,
 | 
| @@ -303,12 +292,6 @@
 | 
|                                     6,
 | 
|                                     EGL_RED_SIZE,
 | 
|                                     5,
 | 
| -                                   EGL_SAMPLES,
 | 
| -                                   samples,
 | 
| -                                   EGL_DEPTH_SIZE,
 | 
| -                                   depth_size,
 | 
| -                                   EGL_STENCIL_SIZE,
 | 
| -                                   stencil_size,
 | 
|                                     EGL_RENDERABLE_TYPE,
 | 
|                                     renderable_type,
 | 
|                                     EGL_SURFACE_TYPE,
 | 
| @@ -522,21 +505,6 @@
 | 
|        HasEGLExtension("EGL_ANGLE_window_fixed_size");
 | 
|    g_egl_surface_orientation_supported =
 | 
|        HasEGLExtension("EGL_ANGLE_surface_orientation");
 | 
| -  // According to
 | 
| -  // https://source.android.com/compatibility/android-cdd.html the
 | 
| -  // EGL_IMG_context_priority extension is mandatory for Virtual
 | 
| -  // Reality High Performance support, but it's not showing in the
 | 
| -  // list of reported EGL extensions even though it's supported on
 | 
| -  // Daydream ready devices. As a fallback, check if other related
 | 
| -  // extensions that were added for VR support are present, and assume
 | 
| -  // that this implies context priority is also supported.
 | 
| -  // TODO(klausw): is there a better way to do this? Filed
 | 
| -  // https://github.com/googlevr/gvr-android-sdk/issues/330 for
 | 
| -  // followup.
 | 
| -  g_egl_context_priority_supported =
 | 
| -      HasEGLExtension("EGL_IMG_context_priority") || (
 | 
| -          HasEGLExtension("EGL_ANDROID_front_buffer_auto_refresh") &&
 | 
| -          HasEGLExtension("EGL_ANDROID_create_native_client_buffer"));
 | 
|  
 | 
|    // Need EGL_ANGLE_flexible_surface_compatibility to allow surfaces with and
 | 
|    // without alpha to be bound to the same context.
 | 
| @@ -596,7 +564,6 @@
 | 
|    g_egl_sync_control_supported = false;
 | 
|    g_egl_window_fixed_size_supported = false;
 | 
|    g_egl_surface_orientation_supported = false;
 | 
| -  g_egl_context_priority_supported = false;
 | 
|    g_use_direct_composition = false;
 | 
|    g_egl_surfaceless_context_supported = false;
 | 
|  
 | 
| @@ -639,11 +606,6 @@
 | 
|  // static
 | 
|  bool GLSurfaceEGL::IsEGLSurfacelessContextSupported() {
 | 
|    return g_egl_surfaceless_context_supported;
 | 
| -}
 | 
| -
 | 
| -// static
 | 
| -bool GLSurfaceEGL::IsEGLContextPrioritySupported() {
 | 
| -  return g_egl_context_priority_supported;
 | 
|  }
 | 
|  
 | 
|  // static
 | 
| 
 |