Revert 239400 "Revert 239280 "Move more file_util functions to b..."

trunk/src/base/file_util.cc

Index: trunk/src/base/file_util.cc
===================================================================
--- trunk/src/base/file_util.cc	(revision 239400)
+++ trunk/src/base/file_util.cc	(working copy)
@@ -129,7 +129,7 @@
 bool ReadFileToString(const FilePath& path, std::string* contents) {
   if (path.ReferencesParent())
     return false;
-  FILE* file = file_util::OpenFile(path, "rb");
+  FILE* file = OpenFile(path, "rb");
   if (!file) {
     return false;
   }
@@ -140,7 +140,7 @@
     if (contents)
       contents->append(buf, len);
   }
-  file_util::CloseFile(file);
+  CloseFile(file);
 
   return true;
 }
@@ -194,16 +194,6 @@
   return false;
 }
 
-}  // namespace base
-
-// -----------------------------------------------------------------------------
-
-namespace file_util {
-
-using base::FileEnumerator;
-using base::FilePath;
-using base::kMaxUniqueFiles;
-
 bool CloseFile(FILE* file) {
   if (file == NULL)
     return true;
@@ -228,6 +218,15 @@
   return true;
 }
 
+}  // namespace base
+
+// -----------------------------------------------------------------------------
+
+namespace file_util {
+
+using base::FilePath;
+using base::kMaxUniqueFiles;
+
 int GetUniquePathNumber(
     const FilePath& path,
     const FilePath::StringType& suffix) {