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

chrome/test/mini_installer_test/chrome_mini_installer.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/mini_installer_test/chrome_mini_installer.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/platform_thread.h"
 #include "base/process_util.h"
@@ skipping 335 matching lines @@
   while ((key.Open(GetRootRegistryKey(), key_path.c_str(), KEY_ALL_ACCESS)) &&
          (timer < 20000)) {
     PlatformThread::Sleep(200);
     timer = timer + 200;
   }
   return CheckRegistryKey(key_path);
 }
 
 // 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.
 void ChromeMiniInstaller::DeleteUserDataFolder() {
   FilePath path;
   PathService::Get(base::DIR_LOCAL_APP_DATA, &path);
   std::wstring profile_path = path.ToWStringHack();
   file_util::AppendToPath(&profile_path,
                           mini_installer_constants::kChromeAppDir);
   file_util::UpOneDirectory(&profile_path);
@@ skipping 168 matching lines @@
 // This method will verify if the installed build is correct.
 bool ChromeMiniInstaller::VerifyStandaloneInstall() {
   std::wstring reg_key_value_returned, standalone_installer_version;
   MiniInstallerTestUtil::GetStandaloneVersion(&standalone_installer_version);
   GetChromeVersionFromRegistry(&reg_key_value_returned);
   if (standalone_installer_version.compare(reg_key_value_returned) == 0)
     return true;
   else
     return false;
 }