Remove file_util::TrimTrailingSeparators(), which is deprecated and

doesn't work well for Windows root drives.

BUG=24722
TEST=existing tests are enough.
Review URL: http://codereview.chromium.org/271086

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29093 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 6 deletions

diff --git a/chrome/test/mini_installer_test/chrome_mini_installer.cc b/chrome/test/mini_installer_test/chrome_mini_installer.cc
index 75fab2d8..79eb1d7 100644
--- a/chrome/test/mini_installer_test/chrome_mini_installer.cc
+++ b/chrome/test/mini_installer_test/chrome_mini_installer.cc
@@ -353,21 +353,20 @@ bool ChromeMiniInstaller::CheckRegistryKeyOnUninstall(
 
 // 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.