Removing ENABLE_PROMO_RESOURCE_SERVICE guards

chrome/common/pref_names.cc

Index: chrome/common/pref_names.cc
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 20939743c01b2be6990ba26855addc35a32375ff..f0a28c831a819c0880bbd1599fbea237a6f87caf 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -1426,10 +1426,8 @@ const char kNtpMostVisitedURLsBlacklist[] = "ntp.most_visited_blacklist";
 // dynamically deliver data for the new tab page.
 const char kNtpPromoResourceCache[] = "ntp.promo_resource_cache";
 
-#if defined(ENABLE_PROMO_RESOURCE_SERVICE)
 // Last time of update of promo_resource_cache.
 const char kNtpPromoResourceCacheUpdate[] = "ntp.promo_resource_cache_update";
-#endif
 
 // Serves promo resources for the NTP.
 const char kNtpPromoResourceServer[] = "ntp.web_resource_server";
@@ -1446,12 +1444,10 @@ const char kNtpShownBookmarksFolder[] = "ntp.shown_bookmarks_folder";
 // Which page should be visible on the new tab page v4
 const char kNtpShownPage[] = "ntp.shown_page";
 
-#if defined(ENABLE_PROMO_RESOURCE_SERVICE)
 // Dates between which the NTP should show a custom logo rather than the
 // standard one.
 const char kNtpCustomLogoStart[] = "ntp.alt_logo_start";

[achuithb, 2012/07/17 14:44:38]

I think these are deprecated. Could you add a TODO(achuith,aruslan) to delete
these?

[aruslan, 2012/07/17 16:08:51]

Done.

 const char kNtpCustomLogoEnd[] = "ntp.alt_logo_end";
-#endif
 
 // The promo resource service version number.
 const char kNtpPromoVersion[] = "ntp.promo_version";