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

webkit/browser/fileapi/native_file_util_unittest.cc

 // Copyright (c) 2013 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"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/platform_file.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/fileapi/native_file_util.h"
@@ skipping 12 matching lines @@
   base::FilePath Path() {
     return data_dir_.path();
   }
 
   base::FilePath Path(const char* file_name) {
     return data_dir_.path().AppendASCII(file_name);
   }
 
   bool FileExists(const base::FilePath& path) {
     return base::PathExists(path) &&
-           !file_util::DirectoryExists(path);
+           !base::DirectoryExists(path);
   }
 
   int64 GetSize(const base::FilePath& path) {
     base::PlatformFileInfo info;
     file_util::GetFileInfo(path, &info);
     return info.size;
   }
 
  private:
   base::ScopedTempDir data_dir_;
@@ skipping 48 matching lines @@
 }
 
 TEST_F(NativeFileUtilTest, CreateAndDeleteDirectory) {
   base::FilePath dir_name = Path("test_dir");
   ASSERT_EQ(base::PLATFORM_FILE_OK,
             NativeFileUtil::CreateDirectory(dir_name,
                                             false /* exclusive */,
                                             false /* recursive */));
 
   EXPECT_TRUE(NativeFileUtil::DirectoryExists(dir_name));
-  EXPECT_TRUE(file_util::DirectoryExists(dir_name));
+  EXPECT_TRUE(base::DirectoryExists(dir_name));
 
   ASSERT_EQ(base::PLATFORM_FILE_ERROR_EXISTS,
             NativeFileUtil::CreateDirectory(dir_name,
                                             true /* exclusive */,
                                             false /* recursive */));
 
   ASSERT_EQ(base::PLATFORM_FILE_OK,
             NativeFileUtil::DeleteDirectory(dir_name));
-  EXPECT_FALSE(file_util::DirectoryExists(dir_name));
+  EXPECT_FALSE(base::DirectoryExists(dir_name));
   EXPECT_FALSE(NativeFileUtil::DirectoryExists(dir_name));
 }
 
 TEST_F(NativeFileUtilTest, TouchFileAndGetFileInfo) {
   base::FilePath file_name = Path("test_file");
   base::PlatformFileInfo native_info;
   ASSERT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND,
             NativeFileUtil::GetFileInfo(file_name, &native_info));
 
   bool created = false;
@@ skipping 111 matching lines @@
   EXPECT_TRUE(FileExists(from_file));
   EXPECT_EQ(1020, GetSize(from_file));
   EXPECT_TRUE(FileExists(to_file1));
   EXPECT_EQ(1020, GetSize(to_file1));
   EXPECT_TRUE(FileExists(to_file2));
   EXPECT_EQ(1020, GetSize(to_file2));
 
   base::FilePath dir = Path("dir");
   ASSERT_EQ(base::PLATFORM_FILE_OK,
             NativeFileUtil::CreateDirectory(dir, false, false));
-  ASSERT_TRUE(file_util::DirectoryExists(dir));
+  ASSERT_TRUE(base::DirectoryExists(dir));
   base::FilePath to_dir_file = dir.AppendASCII("file");
   ASSERT_EQ(base::PLATFORM_FILE_OK,
             NativeFileUtil::CopyOrMoveFile(from_file, to_dir_file, true));
   EXPECT_TRUE(FileExists(to_dir_file));
   EXPECT_EQ(1020, GetSize(to_dir_file));
 
   // Following tests are error checking.
   // Source doesn't exist.
   EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND,
             NativeFileUtil::CopyOrMoveFile(Path("nonexists"), Path("file"),
@@ skipping 38 matching lines @@
   EXPECT_EQ(1020, GetSize(to_file));
 
   ASSERT_EQ(base::PLATFORM_FILE_OK,
             NativeFileUtil::EnsureFileExists(from_file, &created));
   ASSERT_TRUE(FileExists(from_file));
   ASSERT_EQ(base::PLATFORM_FILE_OK, NativeFileUtil::Truncate(from_file, 1020));
 
   base::FilePath dir = Path("dir");
   ASSERT_EQ(base::PLATFORM_FILE_OK,
             NativeFileUtil::CreateDirectory(dir, false, false));
-  ASSERT_TRUE(file_util::DirectoryExists(dir));
+  ASSERT_TRUE(base::DirectoryExists(dir));
   base::FilePath to_dir_file = dir.AppendASCII("file");
   ASSERT_EQ(base::PLATFORM_FILE_OK,
             NativeFileUtil::CopyOrMoveFile(from_file, to_dir_file, false));
   EXPECT_FALSE(FileExists(from_file));
   EXPECT_TRUE(FileExists(to_dir_file));
   EXPECT_EQ(1020, GetSize(to_dir_file));
 
   // Following is error checking.
   // Source doesn't exist.
   EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND,
@@ skipping 19 matching lines @@
                                            Path("nodir").AppendASCII("file"),
                                            false));
   // Destination's parent is a file.
   EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND,
             NativeFileUtil::CopyOrMoveFile(from_file,
                                            Path("tofile1").AppendASCII("file"),
                                            false));
 }
 
 }  // namespace fileapi