Revert "Reset the default browser choice on windows 10 on install"

chrome/installer/setup/install.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/installer/setup/install.h"
 
 #include <windows.h>
 #include <shlobj.h>
 #include <time.h>
 
@@ skipping 23 matching lines @@
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/master_preferences_constants.h"
 #include "chrome/installer/util/set_reg_value_work_item.h"
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/work_item.h"
 #include "chrome/installer/util/work_item_list.h"
 
+
 namespace {
 
 void LogShortcutOperation(ShellUtil::ShortcutLocation location,
                           BrowserDistribution* dist,
                           const ShellUtil::ShortcutProperties& properties,
                           ShellUtil::ShortcutOperation operation,
                           bool failed) {
   // ShellUtil::SHELL_SHORTCUT_UPDATE_EXISTING should not be used at install and
   // thus this method does not handle logging a message for it.
   DCHECK(operation != ShellUtil::SHELL_SHORTCUT_UPDATE_EXISTING);
@@ skipping 189 matching lines @@
     return installer::NEW_VERSION_UPDATED;
   }
 
   LOG(ERROR) << "Not sure how we got here while updating"
              << ", new version: " << new_version.GetString()
              << ", old version: " << (*current_version)->GetString();
 
   return installer::INSTALL_FAILED;
 }
 
-bool CanResetDefaultBrowserIntentPicker() {
-  return base::win::GetVersion() >= base::win::VERSION_WIN10;
-}
-
-void ResetDefaultBrowserIntentPicker() {
-  static const wchar_t kUrlAssociationKeyFormat[] =
-      L"SOFTWARE\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations\\"
-      L"%ls\\UserChoice";
-
-  if (ShellUtil::GetChromeDefaultState() != ShellUtil::IS_DEFAULT) {
-    const base::string16 hash_value_name(L"Hash");
-    InstallUtil::DeleteRegistryValue(
-        HKEY_CURRENT_USER,
-        base::StringPrintf(kUrlAssociationKeyFormat, L"http"), 0,
-        hash_value_name);
-    InstallUtil::DeleteRegistryValue(
-        HKEY_CURRENT_USER,
-        base::StringPrintf(kUrlAssociationKeyFormat, L"https"), 0,
-        hash_value_name);
-  }
-}
-
 }  // end namespace
 
 namespace installer {
 
 void EscapeXmlAttributeValueInSingleQuotes(base::string16* att_value) {
   base::ReplaceChars(*att_value, base::ASCIIToUTF16("&"),
                      base::ASCIIToUTF16("&amp;"), att_value);
   base::ReplaceChars(*att_value, base::ASCIIToUTF16("'"),
                      base::ASCIIToUTF16("&apos;"), att_value);
   base::ReplaceChars(*att_value, base::ASCIIToUTF16("<"),
@@ skipping 191 matching lines @@
   const base::FilePath chrome_exe(
       installer_state.target_path().Append(installer::kChromeExe));
   VLOG(1) << "Registering Chrome as browser: " << chrome_exe.value();
   if (make_chrome_default && ShellUtil::CanMakeChromeDefaultUnattended()) {
     int level = ShellUtil::CURRENT_USER;
     if (installer_state.system_install())
       level = level | ShellUtil::SYSTEM_LEVEL;
     ShellUtil::MakeChromeDefault(dist, level, chrome_exe, true);
   } else {
     ShellUtil::RegisterChromeBrowser(dist, chrome_exe, base::string16(), false);
-    if (make_chrome_default && CanResetDefaultBrowserIntentPicker())
-      ResetDefaultBrowserIntentPicker();
   }
 }
 
 InstallStatus InstallOrUpdateProduct(
     const installer::InstallationState& original_state,
     const installer::InstallerState& installer_state,
     const base::FilePath& setup_path,
     const base::FilePath& archive_path,
     const base::FilePath& install_temp_path,
     const base::FilePath& src_path,
@@ skipping 208 matching lines @@
   // Read master_preferences copied beside chrome.exe at install.
   MasterPreferences prefs(installation_root.AppendASCII(kDefaultMasterPrefs));
   base::FilePath chrome_exe(installation_root.Append(kChromeExe));
   CreateOrUpdateShortcuts(
       chrome_exe, chrome, prefs, CURRENT_USER, install_operation);
 
   UpdateDefaultBrowserBeaconForPath(chrome_exe);
 }
 
 }  // namespace installer