Remove promotion-type-specific JSON handling from NotificationPromo

chrome/browser/web_resource/promo_resource_service.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/browser/web_resource/promo_resource_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "googleurl/src/gurl.h"
 
 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).
 static const int kPromoServiceVersion = 7;
 
 GURL GetPromoResourceURL() {
   const std::string promo_server_url = CommandLine::ForCurrentProcess()->
       GetSwitchValueASCII(switches::kPromoServerURL);
   return promo_server_url.empty() ?
       NotificationPromo::PromoServerURL() : GURL(promo_server_url);
@@ skipping 133 matching lines @@
 }
 
 std::string PromoResourceService::GetPromoLocale() {
   PrefService* local_state = g_browser_process->local_state();
   return local_state->GetString(prefs::kNtpPromoLocale);
 }
 
 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;
 #endif
   notification_promo.InitFromJson(parsed_json, promo_type);
 
   if (notification_promo.new_notification()) {
     ScheduleNotification(notification_promo.StartTimeForGroup(),
                          notification_promo.EndTime());
   }
 }