Use alternate icon for Chrome shortcuts if specified in master preferences.

chrome/browser/first_run_win.cc

Index: chrome/browser/first_run_win.cc
diff --git a/chrome/browser/first_run_win.cc b/chrome/browser/first_run_win.cc
index 7d16dc343760f8a15e86af26c138c47f7e41b607..994fa71ea9a0b3bff9451ec6db4a738b940fc459 100644
--- a/chrome/browser/first_run_win.cc
+++ b/chrome/browser/first_run_win.cc
@@ -186,8 +186,14 @@ bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,
 
   if (new_tabs)
     *new_tabs = installer_util::GetFirstRunTabs(prefs.get());
-  if (ping_delay)
-    installer_util::GetDistributionPingDelay(prefs.get(), ping_delay);
+  if (ping_delay) {
+    if (!installer_util::GetDistroIntegerPreference(prefs.get(),
+        installer_util::master_preferences::kDistroPingDelay, ping_delay)) {
+      // 90 seconds is the default that we want to use in case master
+      // preferences is missing, corrupt or ping_delay is missing.
+      *ping_delay = 90;
+    }
+  }
 
   if (installer_util::GetDistroBooleanPreference(prefs.get(),
       installer_util::master_preferences::kRequireEula)) {