Move more file_util functions to base namespace.

This moves DevicePathToDriveLetterPath, NormalizeToNativeFilePath, IsLink, and GetFileInfo.

This also removes some explicit "base::" usage in base files I touched.

TBR=jam

Review URL: https://codereview.chromium.org/105293002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238763 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 14 insertions, 15 deletions

diff --git a/webkit/browser/blob/local_file_stream_reader_unittest.cc b/webkit/browser/blob/local_file_stream_reader_unittest.cc
index 501d62f7..ef7fb60 100644
--- a/webkit/browser/blob/local_file_stream_reader_unittest.cc
+++ b/webkit/browser/blob/local_file_stream_reader_unittest.cc
@@ -68,7 +68,7 @@ class LocalFileStreamReaderTest : public testing::Test {
 
     file_util::WriteFile(test_path(), kTestData, kTestDataSize);
     base::PlatformFileInfo info;
-    ASSERT_TRUE(file_util::GetFileInfo(test_path(), &info));
+    ASSERT_TRUE(base::GetFileInfo(test_path(), &info));
     test_file_modification_time_ = info.last_modified;
   }
 
diff --git a/webkit/browser/database/database_tracker.cc b/webkit/browser/database/database_tracker.cc
index 50a3bf1..ae4adc9 100644
--- a/webkit/browser/database/database_tracker.cc
+++ b/webkit/browser/database/database_tracker.cc
@@ -692,7 +692,7 @@ int DatabaseTracker::DeleteDataModifiedSince(
          db != details.end(); ++db) {
       base::FilePath db_file = GetFullDBFilePath(*ori, db->database_name);
       base::PlatformFileInfo file_info;
-      file_util::GetFileInfo(db_file, &file_info);
+      base::GetFileInfo(db_file, &file_info);
       if (file_info.last_modified < cutoff)
         continue;
 
diff --git a/webkit/browser/fileapi/dragged_file_util.cc b/webkit/browser/fileapi/dragged_file_util.cc
index b4536a7..3e81242 100644
--- a/webkit/browser/fileapi/dragged_file_util.cc
+++ b/webkit/browser/fileapi/dragged_file_util.cc
@@ -81,7 +81,7 @@ PlatformFileError DraggedFileUtil::GetFileInfo(
   }
   base::PlatformFileError error =
       NativeFileUtil::GetFileInfo(url.path(), file_info);
-  if (file_util::IsLink(url.path()) && !base::FilePath().IsParent(url.path())) {
+  if (base::IsLink(url.path()) && !base::FilePath().IsParent(url.path())) {
     // Don't follow symlinks unless it's the one that are selected by the user.
     return base::PLATFORM_FILE_ERROR_NOT_FOUND;
   }
diff --git a/webkit/browser/fileapi/local_file_util.cc b/webkit/browser/fileapi/local_file_util.cc
index 3357c69..db2e50c 100644
--- a/webkit/browser/fileapi/local_file_util.cc
+++ b/webkit/browser/fileapi/local_file_util.cc
@@ -51,7 +51,7 @@ class LocalFileEnumerator : public FileSystemFileUtil::AbstractFileEnumerator {
 base::FilePath LocalFileEnumerator::Next() {
   base::FilePath next = file_enum_.Next();
   // Don't return symlinks.
-  while (!next.empty() && file_util::IsLink(next))
+  while (!next.empty() && base::IsLink(next))
     next = file_enum_.Next();
   if (next.empty())
     return next;
@@ -88,7 +88,7 @@ PlatformFileError LocalFileUtil::CreateOrOpen(
   if (error != base::PLATFORM_FILE_OK)
     return error;
   // Disallow opening files in symlinked paths.
-  if (file_util::IsLink(file_path))
+  if (base::IsLink(file_path))
     return base::PLATFORM_FILE_ERROR_NOT_FOUND;
   return NativeFileUtil::CreateOrOpen(
       file_path, file_flags, file_handle, created);
@@ -132,7 +132,7 @@ PlatformFileError LocalFileUtil::GetFileInfo(
   if (error != base::PLATFORM_FILE_OK)
     return error;
   // We should not follow symbolic links in sandboxed file system.
-  if (file_util::IsLink(file_path))
+  if (base::IsLink(file_path))
     return base::PLATFORM_FILE_ERROR_NOT_FOUND;
   error = NativeFileUtil::GetFileInfo(file_path, file_info);
   if (error == base::PLATFORM_FILE_OK)
diff --git a/webkit/browser/fileapi/native_file_util.cc b/webkit/browser/fileapi/native_file_util.cc
index e5ff2e7..d195d1e 100644
--- a/webkit/browser/fileapi/native_file_util.cc
+++ b/webkit/browser/fileapi/native_file_util.cc
@@ -155,7 +155,7 @@ PlatformFileError NativeFileUtil::GetFileInfo(
     base::PlatformFileInfo* file_info) {
   if (!base::PathExists(path))
     return base::PLATFORM_FILE_ERROR_NOT_FOUND;
-  if (!file_util::GetFileInfo(path, file_info))
+  if (!base::GetFileInfo(path, file_info))
     return base::PLATFORM_FILE_ERROR_FAILED;
   return base::PLATFORM_FILE_OK;
 }
diff --git a/webkit/browser/fileapi/native_file_util_unittest.cc b/webkit/browser/fileapi/native_file_util_unittest.cc
index 47f88ea..c41a0cb 100644
--- a/webkit/browser/fileapi/native_file_util_unittest.cc
+++ b/webkit/browser/fileapi/native_file_util_unittest.cc
@@ -37,7 +37,7 @@ class NativeFileUtilTest : public testing::Test {
 
   int64 GetSize(const base::FilePath& path) {
     base::PlatformFileInfo info;
-    file_util::GetFileInfo(path, &info);
+    base::GetFileInfo(path, &info);
     return info.size;
   }
 
@@ -126,7 +126,7 @@ TEST_F(NativeFileUtilTest, TouchFileAndGetFileInfo) {
   ASSERT_TRUE(created);
 
   base::PlatformFileInfo info;
-  ASSERT_TRUE(file_util::GetFileInfo(file_name, &info));
+  ASSERT_TRUE(base::GetFileInfo(file_name, &info));
   ASSERT_EQ(base::PLATFORM_FILE_OK,
             NativeFileUtil::GetFileInfo(file_name, &native_info));
   ASSERT_EQ(info.size, native_info.size);
@@ -145,7 +145,7 @@ TEST_F(NativeFileUtilTest, TouchFileAndGetFileInfo) {
             NativeFileUtil::Touch(file_name,
                                   new_accessed, new_modified));
 
-  ASSERT_TRUE(file_util::GetFileInfo(file_name, &info));
+  ASSERT_TRUE(base::GetFileInfo(file_name, &info));
   EXPECT_EQ(new_accessed, info.last_accessed);
   EXPECT_EQ(new_modified, info.last_modified);
 }
diff --git a/webkit/browser/fileapi/obfuscated_file_util.cc b/webkit/browser/fileapi/obfuscated_file_util.cc
index 9b28d57..239b493 100644
--- a/webkit/browser/fileapi/obfuscated_file_util.cc
+++ b/webkit/browser/fileapi/obfuscated_file_util.cc
@@ -647,7 +647,7 @@ PlatformFileError ObfuscatedFileUtil::CopyInForeignFile(
     return base::PLATFORM_FILE_ERROR_FAILED;
 
   base::PlatformFileInfo src_platform_file_info;
-  if (!file_util::GetFileInfo(src_file_path, &src_platform_file_info))
+  if (!base::GetFileInfo(src_file_path, &src_platform_file_info))
     return base::PLATFORM_FILE_ERROR_NOT_FOUND;
 
   FileId dest_file_id;
@@ -1028,7 +1028,7 @@ PlatformFileError ObfuscatedFileUtil::GetFileInfoInternal(
   base::PlatformFileError error = NativeFileUtil::GetFileInfo(
       local_path, file_info);
   // We should not follow symbolic links in sandboxed file system.
-  if (file_util::IsLink(local_path)) {
+  if (base::IsLink(local_path)) {
     LOG(WARNING) << "Found a symbolic file.";
     error = base::PLATFORM_FILE_ERROR_NOT_FOUND;
   }
diff --git a/webkit/browser/fileapi/sandbox_directory_database.cc b/webkit/browser/fileapi/sandbox_directory_database.cc
index 4e4dd87..dd37611 100644
--- a/webkit/browser/fileapi/sandbox_directory_database.cc
+++ b/webkit/browser/fileapi/sandbox_directory_database.cc
@@ -244,7 +244,7 @@ bool DatabaseCheckHelper::ScanDatabase() {
 
         // Ensure the backing file exists as a normal file.
         base::PlatformFileInfo platform_file_info;
-        if (!file_util::GetFileInfo(
+        if (!base::GetFileInfo(
                 path_.Append(file_info.data_path), &platform_file_info) ||
             platform_file_info.is_directory ||
             platform_file_info.is_symbolic_link) {
diff --git a/webkit/glue/webfileutilities_impl.cc b/webkit/glue/webfileutilities_impl.cc
index 8c40b96..c7f4c7c 100644
--- a/webkit/glue/webfileutilities_impl.cc
+++ b/webkit/glue/webfileutilities_impl.cc
@@ -32,8 +32,7 @@ bool WebFileUtilitiesImpl::getFileInfo(const WebString& path,
     return false;
   }
   base::PlatformFileInfo file_info;
-  if (!file_util::GetFileInfo(base::FilePath::FromUTF16Unsafe(path),
-                              &file_info))
+  if (!base::GetFileInfo(base::FilePath::FromUTF16Unsafe(path), &file_info))
     return false;
 
   webkit_glue::PlatformFileInfoToWebFileInfo(file_info, &web_file_info);