Removing ENABLE_PROMO_RESOURCE_SERVICE guards

chrome/common/pref_names.cc

 // Copyright (c) 2012 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/common/pref_names.h"
 
 #include "base/basictypes.h"
 
 namespace prefs {
 
@@ skipping 1408 matching lines @@
 // Keeps track of which sessions are collapsed in the Other Devices menu.
 const char kNtpCollapsedForeignSessions[] = "ntp.collapsed_foreign_sessions";
 
 // New Tab Page URLs that should not be shown as most visited thumbnails.
 const char kNtpMostVisitedURLsBlacklist[] = "ntp.most_visited_blacklist";
 
 // Data downloaded from promo resource pages (JSON, RSS) to be used to
 // 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";
 
 // Serves tips for the NTP.
 const char kNtpTipsResourceServer[] = "ntp.tips_resource_server";
 
 // Serves dates to determine display of elements on the NTP.
 const char kNtpDateResourceServer[] = "ntp.date_resource_server";
 
 // Which bookmarks folder should be visible on the new tab page v4.
 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";
 
 // The last locale the promo was fetched for.
 const char kNtpPromoLocale[] = "ntp.promo_locale";
 
 // Whether promo should be shown to Dev builds, Beta and Dev, or all builds.
 const char kNtpPromoBuild[] = "ntp.promo_build";
 
@@ skipping 522 matching lines @@
 const char kNetworkProfileLastWarningTime[] =
     "network_profile.last_warning_time";
 
 #if defined(OS_MACOSX)
 // A timestamp of when the obsolete OS infobar was last shown to a user on 10.5.
 const char kMacLeopardObsoleteInfobarLastShown[] =
     "mac_105_obsolete_infobar_last_shown";
 #endif  // defined(OS_MACOSX)
 
 }  // namespace prefs