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

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

Issue 271086: Remove file_util::TrimTrailingSeparators(), which is deprecated and... (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 | « base/file_util_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/mini_installer_test/chrome_mini_installer.cc
===================================================================
--- chrome/test/mini_installer_test/chrome_mini_installer.cc (revision 28937)
+++ chrome/test/mini_installer_test/chrome_mini_installer.cc (working copy)
@@ -353,21 +353,20 @@
// Deletes Installer folder from Applications directory.
void ChromeMiniInstaller::DeleteFolder(const wchar_t* folder_name) {
- std::wstring install_path = GetChromeInstallDirectoryLocation();
+ FilePath install_path(GetChromeInstallDirectoryLocation());
if (wcscmp(folder_name, L"version_folder") == 0) {
std::wstring delete_path;
delete_path = mini_installer_constants::kChromeAppDir;
std::wstring build_number;
GetChromeVersionFromRegistry(&build_number);
delete_path = delete_path + build_number;
- file_util::AppendToPath(&install_path, delete_path);
+ install_path = install_path.Append(delete_path);
} else if (wcscmp(folder_name,
mini_installer_constants::kChromeAppDir) == 0) {
- file_util::AppendToPath(&install_path, folder_name);
- file_util::TrimTrailingSeparator(&install_path);
+ install_path = install_path.Append(folder_name).StripTrailingSeparators();
}
- printf("This path will be deleted: %ls\n", install_path.c_str());
- ASSERT_TRUE(file_util::Delete(install_path.c_str(), true));
+ printf("This path will be deleted: %ls\n", install_path.value().c_str());
+ ASSERT_TRUE(file_util::Delete(install_path, true));
}
// Will delete user data profile.
« no previous file with comments | « base/file_util_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698