Move more file_util functions to base namespace.

base/file_util.cc

 // Copyright (c) 2012 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 "base/file_util.h"
 
 #if defined(OS_WIN)
 #include <io.h>
 #endif
 #include <stdio.h>
@@ skipping 111 matching lines @@
     if (line1 != line2)
       return false;
   } while (!file1.eof() || !file2.eof());
 
   return true;
 }
 
 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;
   }
 
   char buf[1 << 16];
   size_t len;
   while ((len = fread(buf, 1, sizeof(buf), file)) > 0) {
     if (contents)
       contents->append(buf, len);
   }
-  file_util::CloseFile(file);
+  CloseFile(file);
 
   return true;
 }
 
 bool IsDirectoryEmpty(const FilePath& dir_path) {
   FileEnumerator files(dir_path, false,
       FileEnumerator::FILES | FileEnumerator::DIRECTORIES);
   if (files.Next().empty())
     return true;
   return false;
@@ skipping 33 matching lines @@
   const PlatformFile file = CreatePlatformFile(path, flags, NULL, NULL);
   if (file != kInvalidPlatformFileValue) {
     bool result = TouchPlatformFile(file, last_accessed, last_modified);
     ClosePlatformFile(file);
     return result;
   }
 
   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;
   return fclose(file) == 0;
 }
 
 bool TruncateFile(FILE* file) {
   if (file == NULL)
     return false;
   long current_offset = ftell(file);
   if (current_offset == -1)
     return false;
 #if defined(OS_WIN)
   int fd = _fileno(file);
   if (_chsize(fd, current_offset) != 0)
     return false;
 #else
   int fd = fileno(file);
   if (ftruncate(fd, current_offset) != 0)
     return false;
 #endif
   return true;
 }
 
+}  // namespace base
+
+// -----------------------------------------------------------------------------
+
+namespace file_util {
+
+using base::FilePath;
+using base::kMaxUniqueFiles;
+
 int GetUniquePathNumber(
     const FilePath& path,
     const FilePath::StringType& suffix) {
   bool have_suffix = !suffix.empty();
   if (!PathExists(path) &&
       (!have_suffix || !PathExists(FilePath(path.value() + suffix)))) {
     return 0;
   }
 
   FilePath new_path;
   for (int count = 1; count <= kMaxUniqueFiles; ++count) {
     new_path =
         path.InsertBeforeExtensionASCII(base::StringPrintf(" (%d)", count));
     if (!PathExists(new_path) &&
         (!have_suffix || !PathExists(FilePath(new_path.value() + suffix)))) {
       return count;
     }
   }
 
   return -1;
 }
 
 }  // namespace file_util