Incomplete changes to make scoped_ptr_malloc use plain functions.

gfx/gtk_util.h

 // Copyright (c) 2009 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.
 
 #ifndef GFX_GTK_UTIL_H_
 #define GFX_GTK_UTIL_H_
 
 #include <stdint.h>
 #include <vector>
 
@@ skipping 32 matching lines @@
 // Modify the given region by subtracting the given rectangles.
 void SubtractRectanglesFromRegion(GdkRegion* region,
                                   const std::vector<Rect>& cutouts);
 
 // Returns the resolution (DPI) used by pango. A negative values means the
 // resolution hasn't been set.
 double GetPangoResolution();
 
 }  // namespace gfx
 
-namespace {
-// A helper class that will g_object_unref |p| when it goes out of scope.
-// This never adds a ref, it only unrefs.
-template <typename Type>
-struct GObjectUnrefer {
-  void operator()(Type* ptr) const {
-    if (ptr)
-      g_object_unref(ptr);
-  }
-};
-}  // namespace
-
 // It's not legal C++ to have a templatized typedefs, so we wrap it in a
 // struct.  When using this, you need to include ::Type.  E.g.,
 // ScopedGObject<GdkPixbufLoader>::Type loader(gdk_pixbuf_loader_new());
 template<class T>
 struct ScopedGObject {
-  typedef scoped_ptr_malloc<T, GObjectUnrefer<T> > Type;
+  typedef scoped_ptr_malloc<T, FreeFnAdapter<g_object_unref> > Type;
 };
 
 #endif  // GFX_GTK_UTIL_H_