Incomplete changes to make scoped_ptr_malloc use plain functions.

chrome/gpu/gpu_backing_store_glx_context.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.
 
 #include "chrome/gpu/gpu_backing_store_glx_context.h"
 
 #include "app/gfx/gl/gl_bindings.h"
 #include "app/x11_util.h"
 #include "base/scoped_ptr.h"
 #include "chrome/gpu/gpu_thread.h"
@@ skipping 34 matching lines @@
       bool success = glXMakeCurrent(gpu_thread_->display(), window_id,
                                     context_);
       DCHECK(success);
     }
     previous_window_id_ = window_id;
     return context_;
   }
   tried_to_init_ = true;
 
   int attrib_list[] = { GLX_RGBA, GLX_DOUBLEBUFFER, 0 };
-  scoped_ptr_malloc<XVisualInfo, ScopedPtrXFree> visual_info(
+  scoped_ptr_malloc<XVisualInfo, FreeFnAdapterIgnoreReturn< ::XFree> > visual_info(
       glXChooseVisual(gpu_thread_->display(), 0, attrib_list));
   if (!visual_info.get())
     return NULL;
 
   context_ = glXCreateContext(gpu_thread_->display(), visual_info.get(),
                               NULL, True);
   bool success = glXMakeCurrent(gpu_thread_->display(), window_id, context_);
   DCHECK(success);
   return context_;
 }
@@ skipping 48 matching lines @@
   is_frame_buffer_bound_ = false;
 
   DCHECK(temp_scroll_texture_id_);
   unsigned int new_texture = temp_scroll_texture_id_;
 
   temp_scroll_texture_id_ = old_texture;
   temp_scroll_texture_size_ = old_size;
 
   return new_texture;
 }