Update from https://crrev.com/320343

ui/gl/gl_surface_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.
 
 extern "C" {
 #include <X11/Xlib.h>
 }
 
 #include "ui/gl/gl_surface_glx.h"
 
@@ skipping 15 matching lines @@
 #include "ui/gfx/x/x11_connection.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/sync_control_vsync_provider.h"
 
 namespace gfx {
 
 namespace {
 
-// scoped_ptr functor for XFree(). Use as follows:
-//   scoped_ptr<XVisualInfo, ScopedPtrXFree> foo(...);
-// where "XVisualInfo" is any X type that is freed with XFree.
-struct ScopedPtrXFree {
-  void operator()(void* x) const {
-    ::XFree(x);
-  }
-};
-
 Display* g_display = NULL;
 const char* g_glx_extensions = NULL;
 bool g_glx_context_create = false;
 bool g_glx_create_context_robustness_supported = false;
 bool g_glx_texture_from_pixmap_supported = false;
 bool g_glx_oml_sync_control_supported = false;
 
 // Track support of glXGetMscRateOML separately from GLX_OML_sync_control as a
 // whole since on some platforms (e.g. crosbug.com/34585), glXGetMscRateOML
 // always fails even though GLX_OML_sync_control is reported as being supported.
@@ skipping 118 matching lines @@
     if (!XGetWindowAttributes(display_, window_, &attributes)) {
       LOG(ERROR) << "XGetWindowAttributes failed for window " <<
         window_ << ".";
       return;
     }
 
     XVisualInfo visual_info_template;
     visual_info_template.visualid = XVisualIDFromVisual(attributes.visual);
 
     int visual_info_count = 0;
-    scoped_ptr<XVisualInfo, ScopedPtrXFree> visual_info_list(
-        XGetVisualInfo(display_, VisualIDMask,
-                       &visual_info_template, &visual_info_count));
+    gfx::XScopedPtr<XVisualInfo> visual_info_list(XGetVisualInfo(
+        display_, VisualIDMask, &visual_info_template, &visual_info_count));
 
     DCHECK(visual_info_list.get());
     if (visual_info_count == 0) {
       LOG(ERROR) << "No visual info for visual ID.";
       return;
     }
 
     context_ = glXCreateContext(display_, visual_info_list.get(), NULL, True);
 
     DCHECK(NULL != context_);
@@ skipping 350 matching lines @@
         window_,
         &attributes)) {
       LOG(ERROR) << "XGetWindowAttributes failed for window " <<
           window_ << ".";
       return NULL;
     }
 
     int visual_id = XVisualIDFromVisual(attributes.visual);
 
     int num_elements = 0;
-    scoped_ptr<GLXFBConfig, ScopedPtrXFree> configs(
-        glXGetFBConfigs(g_display,
-                        DefaultScreen(g_display),
-                        &num_elements));
+    gfx::XScopedPtr<GLXFBConfig> configs(
+        glXGetFBConfigs(g_display, DefaultScreen(g_display), &num_elements));
     if (!configs.get()) {
       LOG(ERROR) << "glXGetFBConfigs failed.";
       return NULL;
     }
     if (!num_elements) {
       LOG(ERROR) << "glXGetFBConfigs returned 0 elements.";
       return NULL;
     }
     bool found = false;
     int i;
@@ skipping 51 matching lines @@
     GLX_BLUE_SIZE, 8,
     GLX_GREEN_SIZE, 8,
     GLX_RED_SIZE, 8,
     GLX_RENDER_TYPE, GLX_RGBA_BIT,
     GLX_DRAWABLE_TYPE, GLX_PBUFFER_BIT,
     GLX_DOUBLEBUFFER, False,
     0
   };
 
   int num_elements = 0;
-  scoped_ptr<GLXFBConfig, ScopedPtrXFree> configs(
-      glXChooseFBConfig(g_display,
-                        DefaultScreen(g_display),
-                        config_attributes,
-                        &num_elements));
+  gfx::XScopedPtr<GLXFBConfig> configs(glXChooseFBConfig(
+      g_display, DefaultScreen(g_display), config_attributes, &num_elements));
   if (!configs.get()) {
     LOG(ERROR) << "glXChooseFBConfig failed.";
     return false;
   }
   if (!num_elements) {
     LOG(ERROR) << "glXChooseFBConfig returned 0 elements.";
     return false;
   }
 
   config_ = configs.get()[0];
@@ skipping 43 matching lines @@
 
 void* PbufferGLSurfaceGLX::GetConfig() {
   return config_;
 }
 
 PbufferGLSurfaceGLX::~PbufferGLSurfaceGLX() {
   Destroy();
 }
 
 }  // namespace gfx