[Merge M48] Remove support for chrome_shortcut_icon_index master_pref.

chrome/installer/util/chrome_browser_operations.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/util/chrome_browser_operations.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
@@ skipping 89 matching lines @@
 
 bool ChromeBrowserOperations::ShouldCreateUninstallEntry(
     const std::set<base::string16>& options) const {
   return true;
 }
 
 // Modifies a ShortcutProperties object by adding default values to
 // uninitialized members. Tries to assign:
 // - target: |chrome_exe|.
 // - icon: from |chrome_exe|.
-// - icon_index: |dist|'s icon index (possibly overridden by
-//       khromeShortcutIconIndex in master_preferences)
+// - icon_index: |dist|'s icon index
 // - app_id: the browser model id for the current install.
 // - description: |dist|'s description.
 void ChromeBrowserOperations::AddDefaultShortcutProperties(
       BrowserDistribution* dist,
       const base::FilePath& target_exe,
       ShellUtil::ShortcutProperties* properties) const {
   if (!properties->has_target())
     properties->set_target(target_exe);
 
   if (!properties->has_icon()) {
-    int icon_index =
-        dist->GetIconIndex(BrowserDistribution::SHORTCUT_CHROME);
-    base::FilePath prefs_path(target_exe.DirName().AppendASCII(
-        installer::kDefaultMasterPrefs));
-    if (base::PathExists(prefs_path)) {
-      installer::MasterPreferences prefs(prefs_path);
-      prefs.GetInt(installer::master_preferences::kChromeShortcutIconIndex,
-                   &icon_index);
-    }
-    properties->set_icon(target_exe, icon_index);
+    properties->set_icon(
+        target_exe, dist->GetIconIndex(BrowserDistribution::SHORTCUT_CHROME));
   }
 
   if (!properties->has_app_id()) {
-    bool is_per_user_install = InstallUtil::IsPerUserInstall(target_exe);
-    properties->set_app_id(
-        ShellUtil::GetBrowserModelId(dist, is_per_user_install));
+    properties->set_app_id(ShellUtil::GetBrowserModelId(
+        dist, InstallUtil::IsPerUserInstall(target_exe)));
   }
 
   if (!properties->has_description())
     properties->set_description(dist->GetAppDescription());
 }
 
 void ChromeBrowserOperations::LaunchUserExperiment(
     const base::FilePath& setup_path,
     const std::set<base::string16>& options,
     InstallStatus status,
     bool system_level) const {
   base::CommandLine base_command(setup_path);
   AppendProductFlags(options, &base_command);
   installer::LaunchBrowserUserExperiment(base_command, status, system_level);
 }
 
 }  // namespace installer