Incomplete changes to make scoped_ptr_malloc use plain functions.

app/gfx/gl/gl_context_linux.cc

 // Copyright (c) 2010 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.
 
 // This file implements the ViewGLContext and PbufferGLContext classes.
 
 #include "app/gfx/gl/gl_context.h"
 
 #include <GL/osmesa.h>
 
@@ skipping 124 matching lines @@
   virtual void* GetHandle();
 
  private:
   GLContextHandle context_;
   Pixmap pixmap_;
   GLXPixmap glx_pixmap_;
 
   DISALLOW_COPY_AND_ASSIGN(PixmapGLContext);
 };
 
-// scoped_ptr functor for XFree(). Use as follows:
-//   scoped_ptr_malloc<XVisualInfo, ScopedPtrXFree> foo(...);
-// where "XVisualInfo" is any X type that is freed with XFree.
-class ScopedPtrXFree {
- public:
-  void operator()(void* x) const {
-    ::XFree(x);
-  }
-};
-
 bool GLContext::InitializeOneOff() {
   static bool initialized = false;
   if (initialized)
     return true;
 
   static const GLImplementation kAllowedGLImplementations[] = {
     kGLImplementationEGLGLES2,
     kGLImplementationDesktopGL,
     kGLImplementationOSMesaGL
   };
@@ skipping 27 matching lines @@
   if (multisampled) {
     LOG(WARNING) << "Multisampling not implemented.";
   }
 
   Display* display = x11_util::GetXDisplay();
   XWindowAttributes attributes;
   XGetWindowAttributes(display, window_, &attributes);
   XVisualInfo visual_info_template;
   visual_info_template.visualid = XVisualIDFromVisual(attributes.visual);
   int visual_info_count = 0;
-  scoped_ptr_malloc<XVisualInfo, ScopedPtrXFree> visual_info_list(
+  scoped_ptr_malloc<XVisualInfo, FreeFnAdapterIgnoreReturn< ::XFree> > visual_info_list(
       XGetVisualInfo(display, VisualIDMask,
                      &visual_info_template,
                      &visual_info_count));
   DCHECK(visual_info_list.get());
   DCHECK_GT(visual_info_count, 0);
   context_ = NULL;
   for (int i = 0; i < visual_info_count; ++i) {
     context_ = glXCreateContext(display, visual_info_list.get() + i, 0, True);
     if (context_)
       break;
@@ skipping 260 matching lines @@
     GLX_RGBA_BIT,
     GLX_DOUBLEBUFFER,
     0,
     0
   };
 
   Display* display = x11_util::GetXDisplay();
 
   int nelements = 0;
   // TODO(kbr): figure out whether hardcoding screen to 0 is sufficient.
-  scoped_ptr_malloc<GLXFBConfig, ScopedPtrXFree> config(
+  scoped_ptr_malloc<GLXFBConfig, FreeFnAdapterIgnoreReturn< ::XFree> > config(
       glXChooseFBConfig(display, 0, config_attributes, &nelements));
   if (!config.get()) {
     LOG(ERROR) << "glXChooseFBConfig failed.";
     return false;
   }
   if (!nelements) {
     LOG(ERROR) << "glXChooseFBConfig returned 0 elements.";
     return false;
   }
 
@@ skipping 98 matching lines @@
   LOG(INFO) << "GL context: using pixmaps.";
 
   static int attributes[] = {
     GLX_RGBA,
     0
   };
 
   Display* display = x11_util::GetXDisplay();
   int screen = DefaultScreen(display);
 
-  scoped_ptr_malloc<XVisualInfo, ScopedPtrXFree> visual_info(
+  scoped_ptr_malloc<XVisualInfo, FreeFnAdapterIgnoreReturn< ::XFree> > visual_info(
       glXChooseVisual(display, screen, attributes));
 
   if (!visual_info.get()) {
     LOG(ERROR) << "glXChooseVisual failed.";
     return false;
   }
 
   GLContextHandle shared_handle = NULL;
   if (shared_context)
     shared_handle = static_cast<GLContextHandle>(shared_context->GetHandle());
@@ skipping 121 matching lines @@
     }
     case kGLImplementationMockGL:
       return new StubGLContext;
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 }  // namespace gfx