Use different names for Chrome/Chromium for Chrome HTML prog id. If we

chrome/installer/setup/setup.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.
 
 #include <shlobj.h>
 
 #include "chrome/installer/setup/setup.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 22 matching lines @@
   LOG(INFO) << "Adding Chrome to Media player list at " << reg_path;
   scoped_ptr<WorkItem> work_item(WorkItem::CreateCreateRegKeyWorkItem(
       HKEY_LOCAL_MACHINE, reg_path));
 
   // if the operation fails we log the error but still continue
   if (!work_item.get()->Do())
     LOG(ERROR) << "Could not add Chrome to media player inclusion list.";
 
 }
 
-void DoFirstInstallTasks(std::wstring install_path, int options) {
+void RegisterChromeOnMachine(std::wstring install_path, int options) {
   bool system_level = (options & installer_util::SYSTEM_LEVEL) != 0;
   // Try to add Chrome to Media Player shim inclusion list. We don't do any
   // error checking here because this operation will fail if user doesn't
   // have admin rights and we want to ignore the error.
   AddChromeToMediaPlayerList();
 
   // We try to register Chrome as a valid browser on local machine. This
   // will work only if current user has admin rights.
   std::wstring chrome_exe(install_path);
   file_util::AppendToPath(&chrome_exe, installer_util::kChromeExe);
@@ skipping 175 matching lines @@
       LOG(INFO) << "Version updated to " << new_version.GetString();
       result = installer_util::NEW_VERSION_UPDATED;
     } else {
       NOTREACHED();
     }
 
     if (!CreateOrUpdateChromeShortcuts(exe_path, options, result,
                                        install_path, new_version.GetString()))
       LOG(WARNING) << "Failed to create/update start menu shortcut.";
 
-    if (result == installer_util::FIRST_INSTALL_SUCCESS ||
-        result == installer_util::INSTALL_REPAIRED) {
-      DoFirstInstallTasks(install_path, options);
-    } else {
-      RemoveOldVersionDirs(install_path, new_version.GetString());
-    }
+    RemoveOldVersionDirs(install_path, new_version.GetString());
+
+    RegisterChromeOnMachine(install_path, options);
   }
 
   return result;
 }