Fix some problems with machine level install.

chrome/installer/setup/uninstall.cc

 // Copyright (c) 2006-2008 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.
 //
 // This file defines the methods useful for uninstalling Chrome.
 
 #include "chrome/installer/setup/uninstall.h"
 
 #include <atlbase.h>
 #include <windows.h>
@@ skipping 39 matching lines @@
     LOG(ERROR) << "Failed to get location for shortcut.";
   } else {
     BrowserDistribution* dist = BrowserDistribution::GetDistribution();
     file_util::AppendToPath(&shortcut_path, dist->GetApplicationName());
     LOG(INFO) << "Deleting shortcut " << shortcut_path;
     if (!file_util::Delete(shortcut_path, true))
       LOG(ERROR) << "Failed to delete folder: " << shortcut_path;
   }
 }
 
+// Deletes all installed files of Chromium and Folders. Before deleting it
+// needs to move setup.exe in a temp folder because the current process
+// is using that file. It returns false when it can not get the path to
+// installation folder, in all other cases it returns true even in case
+// of error (only logs the error).
+bool DeleteFilesAndFolders(const std::wstring& exe_path, bool system_uninstall,
+    const installer::Version& installed_version) {
+  std::wstring install_path(installer::GetChromeInstallPath(system_uninstall));
+  if (install_path.empty()) {
+    LOG(ERROR) << "Could not get installation destination path.";
+    return false; // Nothing else we can do for uninstall, so we return.
+  } else {
+    LOG(INFO) << "install destination path: " << install_path;
+  }
+
+  std::wstring setup_exe(installer::GetInstallerPathUnderChrome(
+      install_path, installed_version.GetString()));
+  file_util::AppendToPath(&setup_exe, file_util::GetFilenameFromPath(exe_path));
+
+  std::wstring temp_file;
+  file_util::CreateTemporaryFileName(&temp_file);
+  file_util::Move(setup_exe, temp_file);
+
+  LOG(INFO) << "Deleting install path " << install_path;
+  if (!file_util::Delete(install_path, true))
+    LOG(ERROR) << "Failed to delete folder: " << install_path;
+
+  // Now check and delete if the parent directories are empty
+  // For example Google\Chrome or Chromium
+  std::wstring parent_dir = file_util::GetDirectoryFromPath(install_path);
+  if (!parent_dir.empty() && file_util::IsDirectoryEmpty(parent_dir)) {
+    if (!file_util::Delete(parent_dir, true))
+      LOG(ERROR) << "Failed to delete folder: " << parent_dir;
+    parent_dir = file_util::GetDirectoryFromPath(parent_dir);
+    if (!parent_dir.empty() &&
+        file_util::IsDirectoryEmpty(parent_dir)) {
+      if (!file_util::Delete(parent_dir, true))
+        LOG(ERROR) << "Failed to delete folder: " << parent_dir;
+    }
+  }
+  return true;
+}
+
 // This method tries to delete a registry key and logs an error message
 // in case of failure. It returns true if deletion is successful,
 // otherwise false.
 bool DeleteRegistryKey(RegKey& key, const std::wstring& key_path) {
   LOG(INFO) << "Deleting registry key " << key_path;
   if (!key.DeleteKey(key_path.c_str())) {
     LOG(ERROR) << "Failed to delete registry key: " << key_path;
     return false;
   }
   return true;
@@ skipping 49 matching lines @@
 
 
 installer_util::InstallStatus installer_setup::UninstallChrome(
     const std::wstring& exe_path, bool system_uninstall,
     const installer::Version& installed_version, bool remove_all) {
   installer_util::InstallStatus status =
       IsChromeActiveOrUserCancelled(system_uninstall);
   if (status != installer_util::UNINSTALL_CONFIRMED)
     return status;
 
-  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  dist->DoPreUninstallOperations();
 #if defined(GOOGLE_CHROME_BUILD)
   // TODO(rahulk): This should be done by DoPreUninstallOperations call above
   wchar_t product[39];  // GUID + '\0'
   MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);  // Don't show any UI to user.
   for (int i = 0; MsiEnumRelatedProducts(google_update::kGearsUpgradeCode, 0, i,
                                          product) != ERROR_NO_MORE_ITEMS; ++i) {
     LOG(INFO) << "Uninstalling Gears - " << product;
     unsigned int ret = MsiConfigureProduct(product, INSTALLLEVEL_MAXIMUM,
                                            INSTALLSTATE_ABSENT);
     if (ret != ERROR_SUCCESS)
       LOG(ERROR) << "Failed to uninstall Gears " << product << ": " << ret;
   }
 #endif
 
   // Chrome is not in use so lets uninstall Chrome by deleting various files
   // and registry entries. Here we will just make best effort and keep going
   // in case of errors.
   // First delete shortcut from Start->Programs.
   DeleteChromeShortcut(system_uninstall);
 
   // Delete the registry keys (Uninstall key and Version key).
   HKEY reg_root = system_uninstall ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   RegKey key(reg_root, L"", KEY_ALL_ACCESS);
+  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   DeleteRegistryKey(key, dist->GetUninstallRegPath());
   DeleteRegistryKey(key, dist->GetVersionKey());
 
   // Delete Software\Classes\ChromeHTML,
   // Software\Clients\StartMenuInternet\chrome.exe and
   // Software\RegisteredApplications\Chrome
   std::wstring html_prog_id(ShellUtil::kRegClasses);
   file_util::AppendToPath(&html_prog_id, ShellUtil::kChromeHTMLProgId);
   DeleteRegistryKey(key, html_prog_id);
 
@@ skipping 17 matching lines @@
 
     // Delete media player registry key that exists only in HKLM.
     std::wstring reg_path(installer::kMediaPlayerRegPath);
     file_util::AppendToPath(&reg_path, installer_util::kChromeExe);
     DeleteRegistryKey(hklm_key, reg_path);
     hklm_key.Close();
   }
 
   // Finally delete all the files from Chrome folder after moving setup.exe
   // to a temp location.
-  std::wstring install_path(installer::GetChromeInstallPath(system_uninstall));
-  if (install_path.empty()) {
-    LOG(ERROR) << "Could not get installation destination path.";
-    // Nothing else we could do for uninstall, so we return.
+  if (!DeleteFilesAndFolders(exe_path, system_uninstall, installed_version))
     return installer_util::UNINSTALL_FAILED;
-  } else {
-    LOG(INFO) << "install destination path: " << install_path;
-  }
-
-  std::wstring setup_exe(installer::GetInstallerPathUnderChrome(
-      install_path, installed_version.GetString()));
-  file_util::AppendToPath(&setup_exe, file_util::GetFilenameFromPath(exe_path));
-
-  std::wstring temp_file;
-  file_util::CreateTemporaryFileName(&temp_file);
-  file_util::Move(setup_exe, temp_file);
-
-  LOG(INFO) << "Deleting install path " << install_path;
-  if (!file_util::Delete(install_path, true))
-    LOG(ERROR) << "Failed to delete folder: " << install_path;
 
   LOG(INFO) << "Uninstallation complete. Launching Uninstall survey.";
   dist->DoPostUninstallOperations(installed_version);
   return installer_util::UNINSTALL_SUCCESSFUL;
 }