commit 0878fea86304c50832a572e4ef051bc1bd12e141
author brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Jul 02 08:07:36 2013 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 14:51:29 2020 +0900
tree 90ad1b32c5d88aeb8478ccb58705f4363ec9c576
parent f487cafcbe8e580f39f3bfbf515278b814a2cf31

Move DeleteAfterReboot, Move, and ReplaceFile to base namespace

Rename ReplaceFileAndGetError (only used once) to ReplaceFile (used 5 times) and have each of those callers specify NULL for the output error if they don't care.

Remove InsertBeforeExtension from file_util.cc which seems to be unused.

BUG=

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

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


CrOS-Libchrome-Original-Commit: 5553d5bcd8c1f0d90d74a2a52a4c9af51d730d01

base/file_util_unittest.cc

diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc
index 7626957..aab56a9 100644
--- a/base/file_util_unittest.cc
+++ b/base/file_util_unittest.cc
@@ -1069,7 +1069,7 @@
       FILE_PATH_LITERAL("Move_Test_File_Destination.txt"));
   ASSERT_FALSE(file_util::PathExists(file_name_to));
 
-  EXPECT_TRUE(file_util::Move(file_name_from, file_name_to));
+  EXPECT_TRUE(base::Move(file_name_from, file_name_to));
 
   // Check everything has been moved.
   EXPECT_FALSE(file_util::PathExists(file_name_from));
@@ -1089,7 +1089,7 @@
   CreateTextFile(file_name_to, L"Old file content");
   ASSERT_TRUE(file_util::PathExists(file_name_to));
 
-  EXPECT_TRUE(file_util::Move(file_name_from, file_name_to));
+  EXPECT_TRUE(base::Move(file_name_from, file_name_to));
 
   // Check everything has been moved.
   EXPECT_FALSE(file_util::PathExists(file_name_from));
@@ -1110,7 +1110,7 @@
   file_util::CreateDirectory(dir_name_to);
   ASSERT_TRUE(file_util::PathExists(dir_name_to));
 
-  EXPECT_FALSE(file_util::Move(file_name_from, dir_name_to));
+  EXPECT_FALSE(base::Move(file_name_from, dir_name_to));
 }
 
 
@@ -1135,7 +1135,7 @@
 
   ASSERT_FALSE(file_util::PathExists(dir_name_to));
 
-  EXPECT_TRUE(file_util::Move(dir_name_from, dir_name_to));
+  EXPECT_TRUE(base::Move(dir_name_from, dir_name_to));
 
   // Check everything has been moved.
   EXPECT_FALSE(file_util::PathExists(dir_name_from));
@@ -1147,10 +1147,10 @@
   file_name_from = dir_name_to.Append(txt_file_name);
   file_name_to = dir_name_to.Append(FILE_PATH_LITERAL(".."));
   file_name_to = file_name_to.Append(txt_file_name);
-  EXPECT_FALSE(file_util::Move(file_name_from, file_name_to));
+  EXPECT_FALSE(base::Move(file_name_from, file_name_to));
   EXPECT_TRUE(file_util::PathExists(file_name_from));
   EXPECT_FALSE(file_util::PathExists(file_name_to));
-  EXPECT_TRUE(file_util::MoveUnsafe(file_name_from, file_name_to));
+  EXPECT_TRUE(base::MoveUnsafe(file_name_from, file_name_to));
   EXPECT_FALSE(file_util::PathExists(file_name_from));
   EXPECT_TRUE(file_util::PathExists(file_name_to));
 }
@@ -1181,7 +1181,7 @@
   file_util::CreateDirectory(dir_name_exists);
   ASSERT_TRUE(file_util::PathExists(dir_name_exists));
 
-  EXPECT_TRUE(file_util::Move(dir_name_from, dir_name_to));
+  EXPECT_TRUE(base::Move(dir_name_from, dir_name_to));
 
   // Check everything has been moved.
   EXPECT_FALSE(file_util::PathExists(dir_name_from));