Incomplete changes to make scoped_ptr_malloc use plain functions.

chrome/browser/geolocation/wifi_data_provider_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.
 
 // Provides wifi scan API binding for suitable for typical linux distributions.
 // Currently, only the NetworkManager API is used, accessed via D-Bus (in turn
 // accessed via the GLib wrapper).
 
 #include "chrome/browser/geolocation/wifi_data_provider_linux.h"
 
@@ skipping 12 matching lines @@
 const int kTwoNoChangePollingIntervalMilliseconds = 10 * 60 * 1000;  // 10 mins
 
 const char kNetworkManagerServiceName[] = "org.freedesktop.NetworkManager";
 const char kNetworkManagerPath[] = "/org/freedesktop/NetworkManager";
 const char kNetworkManagerInterface[] = "org.freedesktop.NetworkManager";
 
 // From http://projects.gnome.org/NetworkManager/developers/spec.html
 enum { NM_DEVICE_TYPE_WIFI = 2 };
 
 // Utility wrappers to make various GLib & DBus structs into scoped objects.
-class ScopedGPtrArrayFree {
- public:
-  void operator()(GPtrArray* x) const {
-    if (x)
-      g_ptr_array_free(x, TRUE);
-  }
-};
+void ScopedGPtrArrayFree(GPtrArray* x) {
+  g_ptr_array_free(x, TRUE);
+}
 // Use ScopedGPtrArrayPtr as if it were scoped_ptr<GPtrArray>
 typedef scoped_ptr_malloc<GPtrArray, ScopedGPtrArrayFree> ScopedGPtrArrayPtr;
 
-class ScopedGObjectFree {
- public:
-  void operator()(void* x) const {
-    if (x)
-      g_object_unref(x);
-  }
-};
 // Use ScopedDBusGProxyPtr as if it were scoped_ptr<DBusGProxy>
-typedef scoped_ptr_malloc<DBusGProxy, ScopedGObjectFree> ScopedDBusGProxyPtr;
+typedef scoped_ptr_malloc<DBusGProxy, FreeFnAdapter<g_object_unref> >
+    ScopedDBusGProxyPtr;
 
 // Use ScopedGValue::v as an instance of GValue with automatic cleanup.
 class ScopedGValue {
  public:
   ScopedGValue()
       : v(empty_gvalue()) {
   }
   ~ScopedGValue() {
     g_value_unset(&v);
   }
@@ skipping 305 matching lines @@
     return wlan_api.release();
   return NULL;
 }
 
 PollingPolicyInterface* WifiDataProviderLinux::NewPollingPolicy() {
   return new GenericPollingPolicy<kDefaultPollingIntervalMilliseconds,
                                   kNoChangePollingIntervalMilliseconds,
                                   kTwoNoChangePollingIntervalMilliseconds>;
 }