[Merge M48] Remove support for chrome_shortcut_icon_index master_pref.

chrome/installer/util/master_preferences_unittest.cc

Index: chrome/installer/util/master_preferences_unittest.cc
diff --git a/chrome/installer/util/master_preferences_unittest.cc b/chrome/installer/util/master_preferences_unittest.cc
index f5246865104924da39aac6952807ddc8b4ba3214..816bc1389ddc4ee1b33415e19ee7b6c474283689 100644
--- a/chrome/installer/util/master_preferences_unittest.cc
+++ b/chrome/installer/util/master_preferences_unittest.cc
@@ -69,7 +69,6 @@ TEST_F(MasterPreferencesTest, ParseDistroParams) {
       "     \"verbose_logging\": true,\n"
       "     \"require_eula\": true,\n"
       "     \"alternate_shortcut_text\": true,\n"
-      "     \"chrome_shortcut_icon_index\": 1,\n"
       "     \"ping_delay\": 40\n"
       "  },\n"
       "  \"blah\": {\n"
@@ -113,11 +112,6 @@ TEST_F(MasterPreferencesTest, ParseDistroParams) {
       &str_value));
   EXPECT_STREQ("c:\\foo", str_value.c_str());
 
-  int icon_index = 0;
-  EXPECT_TRUE(prefs.GetInt(
-      installer::master_preferences::kChromeShortcutIconIndex,
-      &icon_index));
-  EXPECT_EQ(icon_index, 1);
   int ping_delay = 90;
   EXPECT_TRUE(prefs.GetInt(installer::master_preferences::kDistroPingDelay,
                            &ping_delay));
@@ -133,8 +127,7 @@ TEST_F(MasterPreferencesTest, ParseMissingDistroParams) {
     "     \"import_bookmarks_from_file\": \"\",\n"
     "     \"do_not_create_desktop_shortcut\": true,\n"
     "     \"do_not_create_quick_launch_shortcut\": true,\n"
-    "     \"do_not_launch_chrome\": true,\n"
-    "     \"chrome_shortcut_icon_index\": \"bac\"\n"
+    "     \"do_not_launch_chrome\": true\n"
     "  }\n"
     "} \n";
 
@@ -174,12 +167,6 @@ TEST_F(MasterPreferencesTest, ParseMissingDistroParams) {
       installer::master_preferences::kDistroImportBookmarksFromFilePref,
       &str_value));
 
-  int icon_index = 0;
-  EXPECT_FALSE(prefs.GetInt(
-      installer::master_preferences::kChromeShortcutIconIndex,
-      &icon_index));
-  EXPECT_EQ(icon_index, 0);
-
   int ping_delay = 90;
   EXPECT_FALSE(prefs.GetInt(
       installer::master_preferences::kDistroPingDelay, &ping_delay));