promo_resource_service fixes/cleanup for promos.

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

 // Copyright (c) 2011 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/ui/webui/ntp/ntp_resource_cache.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 400 matching lines @@
     localized_strings.SetString("customlogo",
         InDateRange(profile_->GetPrefs()->GetDouble(prefs::kNTPCustomLogoStart),
                     profile_->GetPrefs()->GetDouble(prefs::kNTPCustomLogoEnd)) ?
         "true" : "false");
   } else {
     localized_strings.SetString("customlogo", "false");
   }
 
   // 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"));
   }
 
   // Load the new tab page appropriate for this build
   // Note that some builds (eg. TOUCHUI) don't make use of everything we
   // do here (all of the template data, etc.), but we keep the back end
   // consistent across builds, supporting the union of all NTP front-ends
   // for simplicity.
   std::string full_html;
@@ skipping 151 matching lines @@
       IDR_NEW_TAB_4_THEME_CSS : IDR_NEW_TAB_THEME_CSS;
   static const base::StringPiece new_tab_theme_css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           ntp_css_resource_id));
 
   // Create the string from our template and the replacements.
   std::string css_string;
   css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
   new_tab_css_ = base::RefCountedString::TakeString(&css_string);
 }