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.
 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;
 
+// The promotion type used for Unpack() and ScheduleNotificationOnInit.
+static const NotificationPromo::PromoType kDefaultPromoType =
+#if defined(OS_ANDROID) || defined(OS_IOS)
+    NotificationPromo::MOBILE_NTP_SYNC_PROMO;
+#else
+    NotificationPromo::NTP_NOTIFICATION_PROMO;
+#endif
+
 GURL GetPromoResourceURL() {
   const std::string promo_server_url = CommandLine::ForCurrentProcess()->
       GetSwitchValueASCII(switches::kPromoServerURL);
   return promo_server_url.empty() ?
       NotificationPromo::PromoServerURL() : GURL(promo_server_url);
 }
 
 bool IsTest() {
   return CommandLine::ForCurrentProcess()->HasSwitch(switches::kPromoServerURL);
 }
@@ skipping 83 matching lines @@
     // multi-profile case. We should probably store version/locale in prefs_
     // as well.
     PrefService* local_state = g_browser_process->local_state();
     local_state->SetInteger(prefs::kNtpPromoVersion, kPromoServiceVersion);
     local_state->SetString(prefs::kNtpPromoLocale, locale);
     prefs_->ClearPref(prefs::kNtpPromoResourceCacheUpdate);
     PostNotification(0);
   } else {
     // If the promo start is in the future, set a notification task to
     // invalidate the NTP cache at the time of the promo start.
-    double promo_start = prefs_->GetDouble(prefs::kNtpPromoStart);
-    double promo_end = prefs_->GetDouble(prefs::kNtpPromoEnd);
-    ScheduleNotification(promo_start, promo_end);
+    NotificationPromo notification_promo(profile_);
+    notification_promo.InitFromPrefs(kDefaultPromoType);
+    ScheduleNotification(notification_promo.StartTimeForGroup(),
+                         notification_promo.EndTime());
   }
 }
 
 void PromoResourceService::PostNotification(int64 delay_ms) {
   // Note that this could cause re-issuing a notification every time
   // we receive an update from a server if something goes wrong.
   // Given that this couldn't happen more frequently than every
   // kCacheUpdateDelay milliseconds, we should be fine.
   // TODO(achuith): This crashes if we post delay_ms = 0 to the message loop.
   // during startup.
@@ skipping 21 matching lines @@
   return local_state->GetInteger(prefs::kNtpPromoVersion);
 }
 
 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)
-    NotificationPromo::NTP_NOTIFICATION_PROMO;
-#else
-    NotificationPromo::MOBILE_NTP_SYNC_PROMO;
-#endif
-  notification_promo.InitFromJson(parsed_json, promo_type);
+  notification_promo.InitFromJson(parsed_json, kDefaultPromoType);
 
   if (notification_promo.new_notification()) {
     ScheduleNotification(notification_promo.StartTimeForGroup(),
                          notification_promo.EndTime());
   }
 }