Move PathIsWritable, DirectoryExists, ContentsEqual, and TextContentsEqual to the base namespace.

webkit/browser/fileapi/native_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 "webkit/browser/fileapi/native_file_util.h"
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/memory/scoped_ptr.h"
 #include "webkit/browser/fileapi/file_system_operation_context.h"
@@ skipping 61 matching lines @@
   return file_util_info_.GetLastModifiedTime();
 }
 
 bool NativeFileEnumerator::IsDirectory() {
   return file_util_info_.IsDirectory();
 }
 
 PlatformFileError NativeFileUtil::CreateOrOpen(
     const base::FilePath& path, int file_flags,
     PlatformFile* file_handle, bool* created) {
-  if (!file_util::DirectoryExists(path.DirName())) {
+  if (!base::DirectoryExists(path.DirName())) {
     // If its parent does not exist, should return NOT_FOUND error.
     return base::PLATFORM_FILE_ERROR_NOT_FOUND;
   }
-  if (file_util::DirectoryExists(path))
+  if (base::DirectoryExists(path))
     return base::PLATFORM_FILE_ERROR_NOT_A_FILE;
   PlatformFileError error_code = base::PLATFORM_FILE_OK;
   *file_handle = base::CreatePlatformFile(path, file_flags,
                                           created, &error_code);
   return error_code;
 }
 
 PlatformFileError NativeFileUtil::Close(PlatformFile file_handle) {
   if (!base::ClosePlatformFile(file_handle))
     return base::PLATFORM_FILE_ERROR_FAILED;
   return base::PLATFORM_FILE_OK;
 }
 
 PlatformFileError NativeFileUtil::EnsureFileExists(
     const base::FilePath& path,
     bool* created) {
-  if (!file_util::DirectoryExists(path.DirName()))
+  if (!base::DirectoryExists(path.DirName()))
     // If its parent does not exist, should return NOT_FOUND error.
     return base::PLATFORM_FILE_ERROR_NOT_FOUND;
   PlatformFileError error_code = base::PLATFORM_FILE_OK;
   // Tries to create the |path| exclusively.  This should fail
   // with base::PLATFORM_FILE_ERROR_EXISTS if the path already exists.
   PlatformFile handle = base::CreatePlatformFile(
       path,
       base::PLATFORM_FILE_CREATE | base::PLATFORM_FILE_READ,
       created, &error_code);
   if (error_code == base::PLATFORM_FILE_ERROR_EXISTS) {
@@ skipping 13 matching lines @@
     bool recursive) {
   // If parent dir of file doesn't exist.
   if (!recursive && !base::PathExists(path.DirName()))
     return base::PLATFORM_FILE_ERROR_NOT_FOUND;
 
   bool path_exists = base::PathExists(path);
   if (exclusive && path_exists)
     return base::PLATFORM_FILE_ERROR_EXISTS;
 
   // If file exists at the path.
-  if (path_exists && !file_util::DirectoryExists(path))
+  if (path_exists && !base::DirectoryExists(path))
     return base::PLATFORM_FILE_ERROR_EXISTS;
 
   if (!file_util::CreateDirectory(path))
     return base::PLATFORM_FILE_ERROR_FAILED;
 
   if (!SetPlatformSpecificDirectoryPermissions(path))
     return base::PLATFORM_FILE_ERROR_FAILED;
 
   return base::PLATFORM_FILE_OK;
 }
@@ skipping 44 matching lines @@
     error_code = base::PLATFORM_FILE_ERROR_FAILED;
   base::ClosePlatformFile(file);
   return error_code;
 }
 
 bool NativeFileUtil::PathExists(const base::FilePath& path) {
   return base::PathExists(path);
 }
 
 bool NativeFileUtil::DirectoryExists(const base::FilePath& path) {
-  return file_util::DirectoryExists(path);
+  return base::DirectoryExists(path);
 }
 
 PlatformFileError NativeFileUtil::CopyOrMoveFile(
     const base::FilePath& src_path,
     const base::FilePath& dest_path,
     bool copy) {
   base::PlatformFileInfo info;
   base::PlatformFileError error = NativeFileUtil::GetFileInfo(src_path, &info);
   if (error != base::PLATFORM_FILE_OK)
     return error;
@@ skipping 20 matching lines @@
   } else {
     if (base::Move(src_path, dest_path))
       return base::PLATFORM_FILE_OK;
   }
   return base::PLATFORM_FILE_ERROR_FAILED;
 }
 
 PlatformFileError NativeFileUtil::DeleteFile(const base::FilePath& path) {
   if (!base::PathExists(path))
     return base::PLATFORM_FILE_ERROR_NOT_FOUND;
-  if (file_util::DirectoryExists(path))
+  if (base::DirectoryExists(path))
     return base::PLATFORM_FILE_ERROR_NOT_A_FILE;
   if (!base::Delete(path, false))
     return base::PLATFORM_FILE_ERROR_FAILED;
   return base::PLATFORM_FILE_OK;
 }
 
 PlatformFileError NativeFileUtil::DeleteDirectory(const base::FilePath& path) {
   if (!base::PathExists(path))
     return base::PLATFORM_FILE_ERROR_NOT_FOUND;
-  if (!file_util::DirectoryExists(path))
+  if (!base::DirectoryExists(path))
     return base::PLATFORM_FILE_ERROR_NOT_A_DIRECTORY;
   if (!file_util::IsDirectoryEmpty(path))
     return base::PLATFORM_FILE_ERROR_NOT_EMPTY;
   if (!base::Delete(path, false))
     return base::PLATFORM_FILE_ERROR_FAILED;
   return base::PLATFORM_FILE_OK;
 }
 
 }  // namespace fileapi