Merge 22314 - Use alternate icon for Chrome shortcuts if specified in master ...

chrome/browser/first_run_win.cc

 // Copyright (c) 2006-2009 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/browser/first_run.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <windows.h>
 #include <shellapi.h>
@@ skipping 168 matching lines @@
     master_prefs = master_prefs.Append(installer_util::kDefaultMasterPrefs);
   }
 
   scoped_ptr<DictionaryValue> prefs(
       installer_util::ParseDistributionPreferences(master_prefs));
   if (!prefs.get())
     return true;
 
   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)) {
     // Show the post-installation EULA. This is done by setup.exe and the
     // result determines if we continue or not. We wait here until the user
     // dismisses the dialog.
 
     // The actual eula text is in a resource in chrome. We extract it to
     // a text file so setup.exe can use it as an inner frame.
     FilePath inner_html;
@@ skipping 653 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TryChromeDialog);
 };
 
 }  // namespace
 
 Upgrade::TryResult Upgrade::ShowTryChromeDialog() {
   TryChromeDialog td;
   return td.ShowModal();
 }