Remove code that adds "Url Protocol" key to registry entry...

chrome/installer/util/shell_util.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 functions that integrate Chrome in Windows shell. These
 // functions can be used by Chrome as well as Chrome installer. All of the
 // work is done by the local functions defined in anonymous namespace in
 // this class.
 
 #include <windows.h>
@@ skipping 36 matching lines @@
   // to register Chrome.
   static std::list<RegistryEntry*> GetAllEntries(const std::wstring& chrome_exe) {
     std::list<RegistryEntry*> entries;
     std::wstring icon_path(chrome_exe);
     ShellUtil::GetChromeIcon(icon_path);
     std::wstring quoted_exe_path = L"\"" + chrome_exe + L"\"";
     std::wstring open_cmd = ShellUtil::GetChromeShellOpenCmd(chrome_exe);
 
     entries.push_front(new RegistryEntry(L"Software\\Classes\\ChromeHTML",
                                          ShellUtil::kChromeHTMLProgIdDesc));
-    entries.push_front(new RegistryEntry(L"Software\\Classes\\ChromeHTML",
-                                         ShellUtil::kRegUrlProtocol, L""));
     entries.push_front(new RegistryEntry(
         L"Software\\Classes\\ChromeHTML\\DefaultIcon", icon_path));
     entries.push_front(new RegistryEntry(
         L"Software\\Classes\\ChromeHTML\\shell\\open\\command", open_cmd));
 
     std::wstring exe_name = file_util::GetFilenameFromPath(chrome_exe);
     std::wstring app_key = L"Software\\Classes\\Applications\\" + exe_name +
                            L"\\shell\\open\\command";
     entries.push_front(new RegistryEntry(app_key, open_cmd));
     for (int i = 0; ShellUtil::kFileAssociations[i] != NULL; i++) {
@@ skipping 140 matching lines @@
 // they exist in HKLM. Returns true if all the entries exist, otherwise false.
 bool IsChromeRegistered(const std::wstring& chrome_exe) {
   bool registered = true;
   std::list<RegistryEntry*> entries = RegistryEntry::GetAllEntries(chrome_exe);
   for (std::list<RegistryEntry*>::iterator itr = entries.begin();
       itr != entries.end(); ++itr) {
     if (registered && !(*itr)->ExistsInHKLM())
       registered = false;
     delete (*itr);
   }
-  LOG(INFO) << "Check for Chrome registeration returned " << registered;
+  LOG(INFO) << "Check for Chrome registration returned " << registered;
   return registered;
 }
 
 bool BindChromeAssociations(HKEY root_key, const std::wstring& chrome_exe) {
   // Create a list of registry entries to create so that we can rollback
   // in case of problem.
   scoped_ptr<WorkItemList> items(WorkItem::CreateWorkItemList());
 
   // file extension associations
   std::wstring classes_path(ShellUtil::kRegClasses);
@@ skipping 129 matching lines @@
       params.append(L"=\"" + chrome_exe + L"\"");
       DWORD ret_val = ShellUtil::SUCCESS;
       InstallUtil::ExecuteExeAsAdmin(exe_path, params, &ret_val);
       if (ret_val == ShellUtil::SUCCESS)
         return ShellUtil::SUCCESS;
     }
   }
   return ShellUtil::FAILURE;
 }
 
+// Remove unnecessary "URL Protocol" entry from shell registration.  This value
+// was written by older installers so ignoring error conditions.
+void RemoveUrlProtocol(HKEY root) {
+  RegKey key(root, L"Software\\Classes\\ChromeHTML", KEY_ALL_ACCESS);
+  key.DeleteValue(ShellUtil::kRegUrlProtocol);
+}
+
 }  // namespace
 
 
 const wchar_t* ShellUtil::kRegDefaultIcon = L"\\DefaultIcon";
 const wchar_t* ShellUtil::kRegShellPath = L"\\shell";
 const wchar_t* ShellUtil::kRegShellOpen = L"\\shell\\open\\command";
 const wchar_t* ShellUtil::kRegStartMenuInternet =
     L"Software\\Clients\\StartMenuInternet";
 const wchar_t* ShellUtil::kRegClasses = L"Software\\Classes";
 const wchar_t* ShellUtil::kRegRegisteredApplications =
@@ skipping 10 matching lines @@
     L".xht", L".xhtml", NULL};
 const wchar_t* ShellUtil::kProtocolAssociations[] = {L"ftp", L"http", L"https",
     NULL};
 const wchar_t* ShellUtil::kRegUrlProtocol = L"URL Protocol";
 
 const wchar_t* ShellUtil::kChromeExtProgId = L"ChromeExt";
 const wchar_t* ShellUtil::kChromeExtProgIdDesc = L"Chrome Extension Installer";
 
 ShellUtil::RegisterStatus ShellUtil::AddChromeToSetAccessDefaults(
     const std::wstring& chrome_exe, bool skip_if_not_admin) {
+  RemoveUrlProtocol(HKEY_LOCAL_MACHINE);
+  RemoveUrlProtocol(HKEY_CURRENT_USER);
+
   if (IsChromeRegistered(chrome_exe))
     return ShellUtil::SUCCESS;
 
   if (win_util::GetWinVersion() == win_util::WINVERSION_VISTA)
     return RegisterOnVista(chrome_exe, skip_if_not_admin);
 
   // Try adding these entries to HKLM first and if that fails try adding
   // to HKCU.
   if (SetAccessDefaultRegEntries(HKEY_LOCAL_MACHINE, chrome_exe))
     return ShellUtil::SUCCESS;
@@ skipping 254 matching lines @@
     return file_util::UpdateShortcutLink(chrome_exe.c_str(),      // target
                                          shortcut.c_str(),        // shortcut
                                          chrome_path.c_str(),     // working dir
                                          NULL,                    // arguments
                                          NULL,                    // description
                                          chrome_exe.c_str(),      // icon file
                                          0);                      // icon index
   }
 }