Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Unified Diff: chrome/test/mini_installer_test/run_all_unittests.cc

Issue 271099: Re-try r29078: Remove some deprecated file_util wstring functions. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/mini_installer_test/mini_installer_test_util.cc ('k') | chrome/tools/crash_service/main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/mini_installer_test/run_all_unittests.cc
===================================================================
--- chrome/test/mini_installer_test/run_all_unittests.cc (revision 29088)
+++ chrome/test/mini_installer_test/run_all_unittests.cc (working copy)
@@ -15,22 +15,20 @@
exit(1);
}
ChromeMiniInstaller installer(mini_installer_constants::kUserInstall);
- std::wstring path = installer.GetChromeInstallDirectoryLocation();
- file_util::AppendToPath(&path, mini_installer_constants::kChromeAppDir);
- file_util::UpOneDirectory(&path);
- std::wstring backup_path = path;
+ FilePath path =
+ FilePath::FromWStringHack(installer.GetChromeInstallDirectoryLocation());
+ path = path.Append(mini_installer_constants::kChromeAppDir).DirName();
+ FilePath backup_path = path;
// Will hold User Data path that needs to be backed-up.
- file_util::AppendToPath(&path,
- mini_installer_constants::kChromeUserDataDir);
+ path = path.Append(mini_installer_constants::kChromeUserDataDir);
// Will hold new backup path to save the profile.
- file_util::AppendToPath(&backup_path,
- mini_installer_constants::kChromeUserDataBackupDir);
+ backup_path = path.Append(mini_installer_constants::kChromeUserDataBackupDir);
// Will check if User Data profile is available.
if (file_util::PathExists(path)) {
// Will check if User Data is already backed up.
// If yes, will delete and create new one.
if (file_util::PathExists(backup_path))
- file_util::Delete(backup_path.c_str(), true);
+ file_util::Delete(backup_path, true);
file_util::CopyDirectory(path, backup_path, true);
} else {
printf("Chrome is not installed. Will not take any backup\n");
« no previous file with comments | « chrome/test/mini_installer_test/mini_installer_test_util.cc ('k') | chrome/tools/crash_service/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698