Renames the function CreateTemporaryFilename to CreateTemporaryFile and track down all callers, also removes the
deprecated function that uses std::wstring.
BUG=3078 (http://crbug.com/3078)
TEST=run base_unittests, installer_util_unittests, net_unittests, setup_unittests, and unit_tests.
Review URL: http://codereview.chromium.org/164537
Patch from Thiago Farina.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23631 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: 33edeab42b851a5617a77caa1d65a3782a01ee7b
diff --git a/base/file_util.cc b/base/file_util.cc
index 505dfb4..d632b96 100644
--- a/base/file_util.cc
+++ b/base/file_util.cc
@@ -343,13 +343,6 @@
*new_temp_path = temp_path.ToWStringHack();
return true;
}
-bool CreateTemporaryFileName(std::wstring* temp_file) {
- FilePath temp_file_path;
- if (!CreateTemporaryFileName(&temp_file_path))
- return false;
- *temp_file = temp_file_path.ToWStringHack();
- return true;
-}
bool Delete(const std::wstring& path, bool recursive) {
return Delete(FilePath::FromWStringHack(path), recursive);
}
diff --git a/base/file_util.h b/base/file_util.h
index 71780f8..1c1a79f 100644
--- a/base/file_util.h
+++ b/base/file_util.h
@@ -283,12 +283,7 @@
// Creates a temporary file. The full path is placed in |path|, and the
// function returns true if was successful in creating the file. The file will
// be empty and all handles closed after this function returns.
-// TODO(erikkay): rename this function and track down all of the callers.
-// (Clarification of erik's comment: the intent is to rename the BlahFileName()
-// calls into BlahFile(), since they create temp files (not temp filenames).)
-bool CreateTemporaryFileName(FilePath* path);
-// Deprecated temporary compatibility function.
-bool CreateTemporaryFileName(std::wstring* temp_file);
+bool CreateTemporaryFile(FilePath* path);
// Create and open a temporary file. File is opened for read/write.
// The full path is placed in |path|, and the function returns true if
@@ -300,9 +295,9 @@
// Similar to CreateAndOpenTemporaryFile, but the file is created in |dir|.
FILE* CreateAndOpenTemporaryFileInDir(const FilePath& dir, FilePath* path);
-// Same as CreateTemporaryFileName but the file is created in |dir|.
-bool CreateTemporaryFileNameInDir(const std::wstring& dir,
- std::wstring* temp_file);
+// Same as CreateTemporaryFile but the file is created in |dir|.
+bool CreateTemporaryFileInDir(const FilePath& dir,
+ FilePath* temp_file);
// Create a new directory under TempPath. If prefix is provided, the new
// directory name is in the format of prefixyyyy.
diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc
index 5a02278..b02df8e 100644
--- a/base/file_util_posix.cc
+++ b/base/file_util_posix.cc
@@ -387,7 +387,7 @@
return mkstemp(buffer);
}
-bool CreateTemporaryFileName(FilePath* path) {
+bool CreateTemporaryFile(FilePath* path) {
FilePath directory;
if (!GetTempDir(&directory))
return false;
@@ -413,10 +413,9 @@
return fdopen(fd, "a+");
}
-
-bool CreateTemporaryFileNameInDir(const std::wstring& dir,
- std::wstring* temp_file) {
- // Not implemented yet.
+// TODO(port): implement me.
+bool CreateTemporaryFileInDir(const FilePath& dir,
+ FilePath* temp_file) {
NOTREACHED();
return false;
}
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc
index 7dff868..b1f7822 100644
--- a/base/file_util_unittest.cc
+++ b/base/file_util_unittest.cc
@@ -777,10 +777,10 @@
}
#endif
-TEST_F(FileUtilTest, CreateTemporaryFileNameTest) {
- std::wstring temp_files[3];
+TEST_F(FileUtilTest, CreateTemporaryFileTest) {
+ FilePath temp_files[3];
for (int i = 0; i < 3; i++) {
- ASSERT_TRUE(file_util::CreateTemporaryFileName(&(temp_files[i])));
+ ASSERT_TRUE(file_util::CreateTemporaryFile(&(temp_files[i])));
EXPECT_TRUE(file_util::PathExists(temp_files[i]));
EXPECT_FALSE(file_util::DirectoryExists(temp_files[i]));
}
@@ -790,7 +790,7 @@
EXPECT_TRUE(file_util::Delete(temp_files[i], false));
}
-TEST_F(FileUtilTest, CreateAndOpenTemporaryFileNameTest) {
+TEST_F(FileUtilTest, CreateAndOpenTemporaryFileTest) {
FilePath names[3];
FILE *fps[3];
int i;