Move Copy* into the base namespace.
This also creates a new base::internal namespace in file_util and I moved some of the internal functions in file_util to there.
BUG=
TBR=jam
Review URL: https://codereview.chromium.org/18332014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210600 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: f0ff2ad2c5bcf8e206baf27dbfaeef7743fd6c0d
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc
index e56192f..5576548 100644
--- a/base/file_util_unittest.cc
+++ b/base/file_util_unittest.cc
@@ -1147,7 +1147,7 @@
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(base::MoveUnsafe(file_name_from, file_name_to));
+ EXPECT_TRUE(base::internal::MoveUnsafe(file_name_from, file_name_to));
EXPECT_FALSE(file_util::PathExists(file_name_from));
EXPECT_TRUE(file_util::PathExists(file_name_to));
}
@@ -1224,7 +1224,7 @@
ASSERT_FALSE(file_util::PathExists(dir_name_to));
- EXPECT_TRUE(file_util::CopyDirectory(dir_name_from, dir_name_to, true));
+ EXPECT_TRUE(base::CopyDirectory(dir_name_from, dir_name_to, true));
// Check everything has been copied.
EXPECT_TRUE(file_util::PathExists(dir_name_from));
@@ -1279,7 +1279,7 @@
file_util::CreateDirectory(dir_name_exists);
ASSERT_TRUE(file_util::PathExists(dir_name_exists));
- EXPECT_TRUE(file_util::CopyDirectory(dir_name_from, dir_name_exists, true));
+ EXPECT_TRUE(base::CopyDirectory(dir_name_from, dir_name_exists, true));
// Check everything has been copied.
EXPECT_TRUE(file_util::PathExists(dir_name_from));
@@ -1327,7 +1327,7 @@
ASSERT_FALSE(file_util::PathExists(dir_name_to));
- EXPECT_TRUE(file_util::CopyDirectory(dir_name_from, dir_name_to, false));
+ EXPECT_TRUE(base::CopyDirectory(dir_name_from, dir_name_to, false));
// Check everything has been copied.
EXPECT_TRUE(file_util::PathExists(dir_name_from));
@@ -1376,7 +1376,7 @@
file_util::CreateDirectory(dir_name_to);
ASSERT_TRUE(file_util::PathExists(dir_name_to));
- EXPECT_TRUE(file_util::CopyDirectory(dir_name_from, dir_name_to, false));
+ EXPECT_TRUE(base::CopyDirectory(dir_name_from, dir_name_to, false));
// Check everything has been copied.
EXPECT_TRUE(file_util::PathExists(dir_name_from));
@@ -1400,7 +1400,7 @@
FILE_PATH_LITERAL("Copy_Test_File_Destination.txt"));
ASSERT_FALSE(file_util::PathExists(file_name_to));
- EXPECT_TRUE(file_util::CopyDirectory(file_name_from, file_name_to, true));
+ EXPECT_TRUE(base::CopyDirectory(file_name_from, file_name_to, true));
// Check the has been copied
EXPECT_TRUE(file_util::PathExists(file_name_to));
@@ -1419,7 +1419,7 @@
CreateTextFile(file_name_to, L"Old file content");
ASSERT_TRUE(file_util::PathExists(file_name_to));
- EXPECT_TRUE(file_util::CopyDirectory(file_name_from, file_name_to, true));
+ EXPECT_TRUE(base::CopyDirectory(file_name_from, file_name_to, true));
// Check the has been copied
EXPECT_TRUE(file_util::PathExists(file_name_to));
@@ -1441,7 +1441,7 @@
FilePath file_name_to =
dir_name_to.Append(FILE_PATH_LITERAL("Copy_Test_File.txt"));
- EXPECT_TRUE(file_util::CopyDirectory(file_name_from, dir_name_to, true));
+ EXPECT_TRUE(base::CopyDirectory(file_name_from, dir_name_to, true));
// Check the has been copied
EXPECT_TRUE(file_util::PathExists(file_name_to));
@@ -1475,7 +1475,7 @@
temp_dir_.path().Append(FILE_PATH_LITERAL("Copy_From_Subdir///"));
#endif
- EXPECT_TRUE(file_util::CopyDirectory(from_path, dir_name_to, true));
+ EXPECT_TRUE(base::CopyDirectory(from_path, dir_name_to, true));
// Check everything has been copied.
EXPECT_TRUE(file_util::PathExists(dir_name_from));
@@ -1500,14 +1500,14 @@
// Copy the file.
FilePath dest_file = dir_name_from.Append(FILE_PATH_LITERAL("DestFile.txt"));
- ASSERT_TRUE(file_util::CopyFile(file_name_from, dest_file));
+ ASSERT_TRUE(base::CopyFile(file_name_from, dest_file));
// Copy the file to another location using '..' in the path.
FilePath dest_file2(dir_name_from);
dest_file2 = dest_file2.AppendASCII("..");
dest_file2 = dest_file2.AppendASCII("DestFile.txt");
- ASSERT_FALSE(file_util::CopyFile(file_name_from, dest_file2));
- ASSERT_TRUE(file_util::CopyFileUnsafe(file_name_from, dest_file2));
+ ASSERT_FALSE(base::CopyFile(file_name_from, dest_file2));
+ ASSERT_TRUE(base::internal::CopyFileUnsafe(file_name_from, dest_file2));
FilePath dest_file2_test(dir_name_from);
dest_file2_test = dest_file2_test.DirName();
@@ -1644,7 +1644,8 @@
ASSERT_FALSE(file_util::PathExists(dir_name_to));
- EXPECT_TRUE(file_util::CopyAndDeleteDirectory(dir_name_from, dir_name_to));
+ EXPECT_TRUE(base::internal::CopyAndDeleteDirectory(dir_name_from,
+ dir_name_to));
// Check everything has been moved.
EXPECT_FALSE(file_util::PathExists(dir_name_from));