Remove promotion-type-specific JSON handling from NotificationPromo

chrome/browser/web_resource/promo_resource_service.cc

Index: chrome/browser/web_resource/promo_resource_service.cc
diff --git a/chrome/browser/web_resource/promo_resource_service.cc b/chrome/browser/web_resource/promo_resource_service.cc
index 3766e96b31ef8ccc063a3a4ab0f73eb903472424..cf6b106f9f05ab87dc3eaabb46a4652526dad417 100644
--- a/chrome/browser/web_resource/promo_resource_service.cc
+++ b/chrome/browser/web_resource/promo_resource_service.cc
@@ -24,9 +24,9 @@ namespace {
 // Delay on first fetch so we don't interfere with startup.
 static const int kStartResourceFetchDelay = 5000;
 
-// Delay between calls to update the cache (12h), and 10s in debug mode.
+// Delay between calls to update the cache (12 hours), and 3 min in debug mode.

[Dan Beam, 2012/08/20 20:58:12]

why'd you change this?

[aruslan, 2012/08/20 22:38:17]

Originally it was 3 minutes, and I changed it to 10 seconds to facilitate
debugging (and I shouldn't have submitted it, my fault).  3 minutes is much
better because any mistakes with handling the notification are not get masked
out by the quick refreshes.
On 2012/08/20 20:58:12, Dan Beam wrote:

 static const int kCacheUpdateDelay = 12 * 60 * 60 * 1000;
-static const int kTestCacheUpdateDelay = 10 * 1000;
+static const int kTestCacheUpdateDelay = 3 * 60 * 1000;
 
 // The version of the service (used to expire the cache when upgrading Chrome
 // to versions with different types of promos).
@@ -180,7 +180,7 @@ std::string PromoResourceService::GetPromoLocale() {
 void PromoResourceService::Unpack(const DictionaryValue& parsed_json) {
   NotificationPromo notification_promo(profile_);
   NotificationPromo::PromoType promo_type =
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) && !defined(OS_IOS)

[msarda, 2012/08/20 16:09:47]

Change the order here:
#if defined(OS_ANDROID) && defined(OS_IOS)
    NotificationPromo::MOBILE_NTP_SYNC_PROMO;
#else
NotificationPromo::NTP_NOTIFICATION_PROMO;
@endif

[Dan Beam, 2012/08/20 20:58:12]

er, I assume you mean

  #if defined(OS_ANDROID) || defined(OS_IOS)

and

  #endif

?

[aruslan, 2012/08/20 22:38:17]

Done.

     NotificationPromo::NTP_NOTIFICATION_PROMO;
 #else
     NotificationPromo::MOBILE_NTP_SYNC_PROMO;