Merge 101979 - promo_resource_service fixes/cleanup for promos.

chrome/browser/ui/webui/ntp/ntp_resource_cache.cc

Index: chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
===================================================================
--- chrome/browser/ui/webui/ntp/ntp_resource_cache.cc	(revision 103209)
+++ chrome/browser/ui/webui/ntp/ntp_resource_cache.cc	(working copy)
@@ -415,14 +415,8 @@
 
   // If the user has preferences for a start and end time for a promo from
   // the server, and this promo string exists, set the localized string.
-  if (profile_->GetPrefs()->FindPreference(prefs::kNTPPromoStart) &&
-      profile_->GetPrefs()->FindPreference(prefs::kNTPPromoEnd) &&
-      profile_->GetPrefs()->FindPreference(prefs::kNTPPromoLine) &&
-      PromoResourceServiceUtil::CanShowPromo(profile_) &&
-      InDateRange(profile_->GetPrefs()->GetDouble(prefs::kNTPPromoStart),
-                  profile_->GetPrefs()->GetDouble(prefs::kNTPPromoEnd))) {
-    localized_strings.SetString(
-        "serverpromo",
+  if (PromoResourceService::CanShowNotificationPromo(profile_)) {
+    localized_strings.SetString("serverpromo",
         profile_->GetPrefs()->GetString(prefs::kNTPPromoLine));
     UserMetrics::RecordAction(UserMetricsAction("NTPPromoShown"));
   }