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

Unified Diff: chrome/installer/setup/uninstall.cc

Issue 13196006: Move path functions from file_util to FilePath object. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: git try Created 7 years, 8 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
Index: chrome/installer/setup/uninstall.cc
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 89436a9e372c88c777e6acdf5aa21d1d8dc75280..f34de8e5925959c8967aba6b11441bb0c42889cb 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -1317,8 +1317,7 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
DeleteAppHostFilesAndFolders(installer_state, product_state->version());
} else if (!installer_state.is_multi_install() ||
product.is_chrome_binaries()) {
- base::FilePath setup_exe(cmd_line.GetProgram());
- file_util::AbsolutePath(&setup_exe);
+ base::FilePath setup_exe(base::MakeAbsoluteFilePath(cmd_line.GetProgram()));
DeleteResult delete_result = DeleteChromeFilesAndFolders(
installer_state, setup_exe);
if (delete_result == DELETE_FAILED) {
@@ -1360,8 +1359,7 @@ void CleanUpInstallationDirectoryAfterUninstall(
*uninstall_status = installer::UNINSTALL_FAILED;
return;
}
- base::FilePath setup_exe(cmd_line.GetProgram());
- file_util::AbsolutePath(&setup_exe);
+ base::FilePath setup_exe(base::MakeAbsoluteFilePath(cmd_line.GetProgram()));
if (!target_path.IsParent(setup_exe)) {
LOG(INFO) << "setup.exe is not in target path. Skipping installer cleanup.";
return;

Powered by Google App Engine
This is Rietveld 408576698