Cleanup: Remove deprecated version of file_util::AppendToPath().

chrome/test/mini_installer_test/installer_test_util.cc

 // Copyright (c) 2012 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/installer_test_util.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process.h"
 #include "base/process_util.h"
@@ skipping 38 matching lines @@
 }  // namespace
 
 namespace installer_test {
 
 bool DeleteInstallDirectory(bool system_level,
                             InstallationValidator::InstallationType type) {
   std::string version = GetVersion(type);
   if (version.empty())
     return false;
   FilePath path;
-  if (!GetInstallDirectory(system_level,
-                           ToBrowserDistributionType(type), &path) ||
-      !file_util::PathExists(path))
+  bool has_install_dir = GetInstallDirectory(system_level,
+                                             ToBrowserDistributionType(type),
+                                             &path);
+  if (!has_install_dir || !file_util::PathExists(path))
     return false;
   path = path.AppendASCII(version);
-  if (!file_util::Delete(path, true))
-    return false;
-  return true;
+  return file_util::Delete(path, true);
 }
 
 bool DeleteRegistryKey(bool system_level,
                        InstallationValidator::InstallationType type) {
-  FilePath::StringType key(google_update::kRegPathClients);
   BrowserDistribution* dist = BrowserDistribution::GetSpecificDistribution(
       ToBrowserDistributionType(type));
-  file_util::AppendToPath(&key, dist->GetAppGuid());
-  HKEY root = HKEY_CURRENT_USER;
-  if (system_level)
-    root = HKEY_LOCAL_MACHINE;
-  if (InstallUtil::DeleteRegistryKey(root, key))
-    return true;
-  return false;
+  FilePath::StringType key(google_update::kRegPathClients);
+  key.push_back(FilePath::kSeparators[0]);
+  key.append(dist->GetAppGuid());
+  HKEY root = system_level ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
+  return InstallUtil::DeleteRegistryKey(root, key);
 }
 
 bool GetChromeInstallDirectory(bool system_level, FilePath* path) {
   return GetInstallDirectory(system_level,
       BrowserDistribution::CHROME_BROWSER, path);
 }
 
 bool GetInstallDirectory(bool system_level,
                          BrowserDistribution::Type type, FilePath* path) {
   BrowserDistribution* dist =
@@ skipping 205 matching lines @@
     return false;
   }
   if (!base::WaitForSingleProcess(process, 60 * 1000)) {
     LOG(ERROR) << "Launched process did not complete.";
     return false;
   }
   return true;
 }
 
 }  // namespace
-