commit 83c44c874df827e377b425affead61b9574b3182
author brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Dec 03 03:55:49 2013 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 15:42:02 2020 +0900
tree 68bacb0681a43d5db6f8adab48cd1340e277b8c3
parent 7d099bbea67dd5d66488fbc5ea531a508515d01d

Move some more file utils to the base namespace.

This also swaps the order of the parameters to GetShmemTempDir so the out
parameter is last, and enhances some documentation.

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

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


CrOS-Libchrome-Original-Commit: fb4bcfa38b2cdd740fd112fabeb5d45add27354b

base/file_util_unittest.cc

diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc
index ebccfd4..968da5b 100644
--- a/base/file_util_unittest.cc
+++ b/base/file_util_unittest.cc
@@ -1564,7 +1564,7 @@
   for (unsigned int i = 0; i < arraysize(kTmpValues); ++i) {
     FilePath path;
     ::_tputenv_s(kTmpKey, kTmpValues[i]);
-    file_util::GetTempDir(&path);
+    base::GetTempDir(&path);
     EXPECT_TRUE(path.IsAbsolute()) << "$TMP=" << kTmpValues[i] <<
         " result=" << path.value();
   }
@@ -1637,7 +1637,7 @@
 
 TEST_F(FileUtilTest, GetShmemTempDirTest) {
   FilePath dir;
-  EXPECT_TRUE(file_util::GetShmemTempDir(&dir, false));
+  EXPECT_TRUE(GetShmemTempDir(false, &dir));
   EXPECT_TRUE(DirectoryExists(dir));
 }
 
@@ -1933,13 +1933,13 @@
 
   ASSERT_TRUE(file_util::CreateDirectory(empty_dir));
 
-  EXPECT_TRUE(file_util::IsDirectoryEmpty(empty_dir));
+  EXPECT_TRUE(base::IsDirectoryEmpty(empty_dir));
 
   FilePath foo(empty_dir.Append(FILE_PATH_LITERAL("foo.txt")));
   std::string bar("baz");
   ASSERT_TRUE(file_util::WriteFile(foo, bar.c_str(), bar.length()));
 
-  EXPECT_FALSE(file_util::IsDirectoryEmpty(empty_dir));
+  EXPECT_FALSE(base::IsDirectoryEmpty(empty_dir));
 }
 
 #if defined(OS_POSIX)