Incomplete changes to make scoped_ptr_malloc use plain functions.

base/process_util_posix.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 <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/resource.h>
@@ skipping 164 matching lines @@
     if (!exited)
       result = kill(process_id, SIGKILL) == 0;
   }
 
   if (!result)
     DPLOG(ERROR) << "Unable to terminate process " << process_id;
 
   return result;
 }
 
-// A class to handle auto-closing of DIR*'s.
-class ScopedDIRClose {
- public:
-  inline void operator()(DIR* x) const {
-    if (x) {
-      closedir(x);
-    }
-  }
-};
-typedef scoped_ptr_malloc<DIR, ScopedDIRClose> ScopedDIR;
+typedef scoped_ptr_malloc<DIR, FreeFnIgnoreReturn<DIR, closedir> > ScopedDIR;
 
 #if defined(OS_LINUX)
   static const rlim_t kSystemDefaultMaxFds = 8192;
   static const char kFDDir[] = "/proc/self/fd";
 #elif defined(OS_MACOSX)
   static const rlim_t kSystemDefaultMaxFds = 256;
   static const char kFDDir[] = "/dev/fd";
 #elif defined(OS_SOLARIS)
   static const rlim_t kSystemDefaultMaxFds = 8192;
   static const char kFDDir[] = "/dev/fd";
@@ skipping 685 matching lines @@
                       const ProcessFilter* filter) {
   bool exited_cleanly =
       WaitForProcessesToExit(executable_name, wait_milliseconds,
                              filter);
   if (!exited_cleanly)
     KillProcesses(executable_name, exit_code, filter);
   return exited_cleanly;
 }
 
 }  // namespace base