summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/file_util.cc13
-rw-r--r--base/file_util.h3
-rw-r--r--chrome/browser/importer/firefox_profile_lock_unittest.cc22
-rw-r--r--chrome/installer/setup/setup_main.cc39
4 files changed, 30 insertions, 47 deletions
diff --git a/base/file_util.cc b/base/file_util.cc
index 8d1b517..e5c8f5a 100644
--- a/base/file_util.cc
+++ b/base/file_util.cc
@@ -347,19 +347,6 @@ bool ContentsEqual(const std::wstring& filename1,
bool CreateDirectory(const std::wstring& full_path) {
return CreateDirectory(FilePath::FromWStringHack(full_path));
}
-bool CreateNewTempDirectory(const std::wstring& prefix,
- std::wstring* new_temp_path) {
-#if defined(OS_WIN)
- FilePath::StringType dir_prefix(prefix);
-#elif defined(OS_POSIX)
- FilePath::StringType dir_prefix = WideToUTF8(prefix);
-#endif
- FilePath temp_path;
- if (!CreateNewTempDirectory(dir_prefix, &temp_path))
- return false;
- *new_temp_path = temp_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 c86e6e4..60e9793 100644
--- a/base/file_util.h
+++ b/base/file_util.h
@@ -290,9 +290,6 @@ bool CreateTemporaryFileInDir(const FilePath& dir,
// If success, return true and output the full path of the directory created.
bool CreateNewTempDirectory(const FilePath::StringType& prefix,
FilePath* new_temp_path);
-// Deprecated temporary compatibility function.
-bool CreateNewTempDirectory(const std::wstring& prefix,
- std::wstring* new_temp_path);
// Creates a directory, as well as creating any parent directories, if they
// don't exist. Returns 'true' on successful creation, or if the directory
diff --git a/chrome/browser/importer/firefox_profile_lock_unittest.cc b/chrome/browser/importer/firefox_profile_lock_unittest.cc
index 3234062..1d86ff5 100644
--- a/chrome/browser/importer/firefox_profile_lock_unittest.cc
+++ b/chrome/browser/importer/firefox_profile_lock_unittest.cc
@@ -45,17 +45,17 @@ TEST_F(FirefoxProfileLockTest, LockTest) {
// Tests basic functionality and verifies that the lock file is deleted after
// use.
TEST_F(FirefoxProfileLockTest, ProfileLock) {
- std::wstring test_path;
- ASSERT_TRUE(file_util::CreateNewTempDirectory(L"firefox_profile",
- &test_path));
- FilePath lock_file_path = FilePath::FromWStringHack(test_path);
+ FilePath test_path;
+ ASSERT_TRUE(file_util::CreateNewTempDirectory(
+ FILE_PATH_LITERAL("firefox_profile"), &test_path));
+ FilePath lock_file_path = test_path;
FileAutoDeleter deleter(lock_file_path);
lock_file_path = lock_file_path.Append(FirefoxProfileLock::kLockFileName);
scoped_ptr<FirefoxProfileLock> lock;
EXPECT_EQ(static_cast<FirefoxProfileLock*>(NULL), lock.get());
EXPECT_FALSE(file_util::PathExists(lock_file_path));
- lock.reset(new FirefoxProfileLock(test_path));
+ lock.reset(new FirefoxProfileLock(test_path.ToWStringHack()));
EXPECT_TRUE(lock->HasAcquired());
EXPECT_TRUE(file_util::PathExists(lock_file_path));
lock->Unlock();
@@ -107,19 +107,19 @@ TEST_F(FirefoxProfileLockTest, ProfileLockOrphaned) {
#if !defined(OS_POSIX)
// Tests two locks contending for the same lock file.
TEST_F(FirefoxProfileLockTest, ProfileLockContention) {
- std::wstring test_path;
- ASSERT_TRUE(file_util::CreateNewTempDirectory(L"firefox_profile",
- &test_path));
- FileAutoDeleter deleter(FilePath::FromWStringHack(test_path));
+ FilePath test_path;
+ ASSERT_TRUE(file_util::CreateNewTempDirectory(
+ FILE_PATH_LITERAL("firefox_profile"), &test_path));
+ FileAutoDeleter deleter(test_path);
scoped_ptr<FirefoxProfileLock> lock1;
EXPECT_EQ(static_cast<FirefoxProfileLock*>(NULL), lock1.get());
- lock1.reset(new FirefoxProfileLock(test_path));
+ lock1.reset(new FirefoxProfileLock(test_path.ToWStringHack()));
EXPECT_TRUE(lock1->HasAcquired());
scoped_ptr<FirefoxProfileLock> lock2;
EXPECT_EQ(static_cast<FirefoxProfileLock*>(NULL), lock2.get());
- lock2.reset(new FirefoxProfileLock(test_path));
+ lock2.reset(new FirefoxProfileLock(test_path.ToWStringHack()));
EXPECT_FALSE(lock2->HasAcquired());
lock1->Unlock();
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index 5cce669..558326f 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -110,15 +110,14 @@ installer_util::InstallStatus RenameChromeExecutables(bool system_install) {
scoped_ptr<WorkItemList> install_list(WorkItem::CreateWorkItemList());
install_list->AddDeleteTreeWorkItem(chrome_old_exe, std::wstring());
- std::wstring temp_path;
- if (!file_util::CreateNewTempDirectory(std::wstring(L"chrome_"),
- &temp_path)) {
- LOG(ERROR) << "Failed to create Temp directory " << temp_path;
+ FilePath temp_path;
+ if (!file_util::CreateNewTempDirectory(L"chrome_", &temp_path)) {
+ LOG(ERROR) << "Failed to create Temp directory " << temp_path.value();
return installer_util::RENAME_FAILED;
}
install_list->AddCopyTreeWorkItem(chrome_new_exe,
chrome_exe,
- temp_path,
+ temp_path.ToWStringHack(),
WorkItem::IF_DIFFERENT,
std::wstring());
HKEY reg_root = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
@@ -203,9 +202,8 @@ installer_util::InstallStatus InstallChrome(const CommandLine& cmd_line,
// Create a temp folder where we will unpack Chrome archive. If it fails,
// then we are doomed, so return immediately and no cleanup is required.
- std::wstring temp_path;
- if (!file_util::CreateNewTempDirectory(std::wstring(L"chrome_"),
- &temp_path)) {
+ FilePath temp_path;
+ if (!file_util::CreateNewTempDirectory(L"chrome_", &temp_path)) {
LOG(ERROR) << "Could not create temporary path.";
InstallUtil::WriteInstallerResult(system_level,
installer_util::TEMP_DIR_FAILED,
@@ -213,15 +211,16 @@ installer_util::InstallStatus InstallChrome(const CommandLine& cmd_line,
NULL);
return installer_util::TEMP_DIR_FAILED;
}
- LOG(INFO) << "created path " << temp_path;
+ LOG(INFO) << "created path " << temp_path.value();
BrowserDistribution* dist = BrowserDistribution::GetDistribution();
- std::wstring unpack_path(temp_path);
+ std::wstring unpack_path(temp_path.ToWStringHack());
file_util::AppendToPath(&unpack_path,
std::wstring(installer::kInstallSourceDir));
bool incremental_install = false;
if (UnPackArchive(archive, system_level, installed_version,
- temp_path, unpack_path, incremental_install)) {
+ temp_path.ToWStringHack(), unpack_path,
+ incremental_install)) {
install_status = installer_util::UNCOMPRESSION_FAILED;
InstallUtil::WriteInstallerResult(system_level, install_status,
IDS_INSTALL_UNCOMPRESSION_FAILED_BASE,
@@ -250,14 +249,14 @@ installer_util::InstallStatus InstallChrome(const CommandLine& cmd_line,
} else {
// We want to keep uncompressed archive (chrome.7z) that we get after
// uncompressing and binary patching. Get the location for this file.
- std::wstring archive_to_copy(temp_path);
+ std::wstring archive_to_copy(temp_path.ToWStringHack());
file_util::AppendToPath(&archive_to_copy,
std::wstring(installer::kChromeArchive));
std::wstring prefs_source_path = cmd_line.GetSwitchValue(
installer_util::switches::kInstallerData);
install_status = installer::InstallOrUpdateChrome(
- cmd_line.program(), archive_to_copy, temp_path, prefs_source_path,
- prefs, *installer_version, installed_version);
+ cmd_line.program(), archive_to_copy, temp_path.ToWStringHack(),
+ prefs_source_path, prefs, *installer_version, installed_version);
int install_msg_base = IDS_INSTALL_FAILED_BASE;
std::wstring chrome_exe;
@@ -309,8 +308,9 @@ installer_util::InstallStatus InstallChrome(const CommandLine& cmd_line,
// Delete temporary files. These include install temporary directory
// and master profile file if present.
scoped_ptr<WorkItemList> cleanup_list(WorkItem::CreateWorkItemList());
- LOG(INFO) << "Deleting temporary directory " << temp_path;
- cleanup_list->AddDeleteTreeWorkItem(temp_path, std::wstring());
+ LOG(INFO) << "Deleting temporary directory " << temp_path.value();
+ cleanup_list->AddDeleteTreeWorkItem(temp_path.ToWStringHack(),
+ std::wstring());
if (cmd_line.HasSwitch(installer_util::switches::kInstallerData)) {
std::wstring prefs_path = cmd_line.GetSwitchValue(
installer_util::switches::kInstallerData);
@@ -386,16 +386,15 @@ bool HandleNonInstallCmdLineOptions(const CommandLine& cmd_line,
// patch to current exe, and store the resulting binary in the path
// specified by --new-setup-exe. But we need to first unpack the file
// given in --update-setup-exe.
- std::wstring temp_path;
- if (!file_util::CreateNewTempDirectory(std::wstring(L"chrome_"),
- &temp_path)) {
+ FilePath temp_path;
+ if (!file_util::CreateNewTempDirectory(L"chrome_", &temp_path)) {
LOG(ERROR) << "Could not create temporary path.";
} else {
std::wstring setup_patch = cmd_line.GetSwitchValue(
installer_util::switches::kUpdateSetupExe);
LOG(INFO) << "Opening archive " << setup_patch;
std::wstring uncompressed_patch;
- if (LzmaUtil::UnPackArchive(setup_patch, temp_path,
+ if (LzmaUtil::UnPackArchive(setup_patch, temp_path.ToWStringHack(),
&uncompressed_patch) == NO_ERROR) {
std::wstring old_setup_exe = cmd_line.program();
std::wstring new_setup_exe = cmd_line.GetSwitchValue(
generated by cgit v1.1 at 2025-03-04 03:23:27 +0000