Removing code to delete obsolete "Google Chrome App Host" uninstall entries in the registry.

chrome/installer/setup/setup_main.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 <windows.h>
 #include <msi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include <string>
@@ skipping 1562 matching lines @@
   pipe_name += user_sid;
 
   google_breakpad::ExceptionHandler* breakpad =
       new google_breakpad::ExceptionHandler(
           temp_directory.value(), NULL, NULL, NULL,
           google_breakpad::ExceptionHandler::HANDLER_ALL, kLargerDumpType,
           pipe_name.c_str(), GetCustomInfo(exe_path));
   return breakpad;
 }
 
-// We renamed "Google Chrome App Host" to "Google Chrome App Launcher",
-// and need to do the same in the Windows\CurrentVersion\Uninstall registry key.
-// The addition / removal of the new key is handled elsewhere.
-// It remains to remove the old key where appropriate.
-// TODO(huangs): Remove this in early March.
-void RemoveDeprecatedAppHostUninstallEntry(
-    const InstallerState& installer_state) {
-  const Product* app_host =
-      installer_state.FindProduct(BrowserDistribution::CHROME_APP_HOST);
-  if (app_host) {
-    const string16 kDeprecatedUninstallRegPath(L"Software\\Microsoft\\Windows\\"
-        L"CurrentVersion\\Uninstall\\Google Chrome App Host");
-    InstallUtil::DeleteRegistryKey(installer_state.root_key(),
-                                   kDeprecatedUninstallRegPath);
-  }
-}
-
-
 }  // namespace
 
 int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
                     wchar_t* command_line, int show_command) {
   // The exit manager is in charge of calling the dtors of singletons.
   base::AtExitManager exit_manager;
   CommandLine::Init(0, NULL);
 
   const MasterPreferences& prefs = MasterPreferences::ForCurrentProcess();
   installer::InitInstallerLogging(prefs);
@@ skipping 83 matching lines @@
   // If --uninstall option is given, uninstall the identified product(s)
   if (is_uninstall) {
     install_status =
         UninstallProducts(original_state, installer_state, cmd_line);
   } else {
     // If --uninstall option is not specified, we assume it is install case.
     install_status =
         InstallProducts(original_state, cmd_line, prefs, &installer_state);
   }
 
-  // TODO(huangs): Remove this in early March.
-  if (!InstallUtil::GetInstallReturnCode(install_status))
-    RemoveDeprecatedAppHostUninstallEntry(installer_state);
-
-
   // Validate that the machine is now in a good state following the operation.
   // TODO(grt): change this to log at DFATAL once we're convinced that the
   // validator handles all cases properly.
   InstallationValidator::InstallationType installation_type =
       InstallationValidator::NO_PRODUCTS;
   LOG_IF(ERROR,
          !InstallationValidator::ValidateInstallationType(system_install,
                                                           &installation_type));
 
   const Product* cf_install =
@@ skipping 30 matching lines @@
   if (!(installer_state.is_msi() && is_uninstall))
     // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
     // to pass through, since this is only returned on uninstall which is
     // never invoked directly by Google Update.
     return_code = InstallUtil::GetInstallReturnCode(install_status);
 
   VLOG(1) << "Installation complete, returning: " << return_code;
 
   return return_code;
 }