Revert 49983 - patch

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 17 matching lines @@
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/platform_file.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/time.h"
 
 #if defined(OS_POSIX)
 #include "base/eintr_wrapper.h"
 #include "base/file_descriptor_posix.h"
-#include "base/logging.h"
 #endif
 
 namespace base {
 class Time;
 }
 
 namespace file_util {
 
 //-----------------------------------------------------------------------------
 // Functions that operate purely on a path string w/o touching the filesystem:
@@ skipping 322 matching lines @@
 };
 
 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";
+      HANDLE_EINTR(close(*x));
     }
   }
 };
 
 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.
 //
@@ skipping 205 matching lines @@
 
 #endif  // UNIT_TEST
 
 }  // 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_