Incomplete changes to make scoped_ptr_malloc use plain functions.

base/file_util.h

 // 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 contains utility functions for dealing with the local
 // filesystem.
 
 #ifndef BASE_FILE_UTIL_H_
 #define BASE_FILE_UTIL_H_
 
@@ skipping 347 matching lines @@
 // Append the data to |fd|. Does not close |fd| when done.
 int WriteFileDescriptor(const int fd, const char* data, int size);
 #endif
 
 // Gets the current working directory for the process.
 bool GetCurrentDirectory(FilePath* path);
 
 // Sets the current working directory for the process.
 bool SetCurrentDirectory(const FilePath& path);
 
-// A class to handle auto-closing of FILE*'s.
-class ScopedFILEClose {
- public:
-  inline void operator()(FILE* x) const {
-    if (x) {
-      fclose(x);
-    }
-  }
-};
+inline void ScopedFILEClose(FILE* f) {
+  fclose(f);
+}
 
 typedef scoped_ptr_malloc<FILE, ScopedFILEClose> ScopedFILE;
 
 #if defined(OS_POSIX)
 // A class to handle auto-closing of FDs.
-class ScopedFDClose {
- public:
-  inline void operator()(int* x) const {
-    if (x && *x >= 0) {
-      if (HANDLE_EINTR(close(*x)) < 0)
-        PLOG(ERROR) << "close";
-    }
+inline void ScopedFDClose(int* x) {
+  if (x && *x >= 0) {
+    if (HANDLE_EINTR(close(*x)) < 0)
+      PLOG(ERROR) << "close";
   }
-};
+}
 
 typedef scoped_ptr_malloc<int, ScopedFDClose> ScopedFD;
 #endif  // OS_POSIX
 
 // A class for enumerating the files in a provided path. The order of the
 // results is not guaranteed.
 //
 // DO NOT USE FROM THE MAIN THREAD of your application unless it is a test
 // program where latency does not matter. This class is blocking.
 class FileEnumerator {
@@ skipping 211 matching lines @@
   bool PreReadImage(const wchar_t* file_path, size_t size_to_read,
                     size_t step_size);
 #endif  // OS_WIN
 }  // namespace file_util
 
 // Deprecated functions have been moved to this separate header file,
 // which must be included last after all the above definitions.
 #include "base/file_util_deprecated.h"
 
 #endif  // BASE_FILE_UTIL_H_