Remove promotion-type-specific JSON handling from NotificationPromo

chrome/browser/web_resource/notification_promo.h

Index: chrome/browser/web_resource/notification_promo.h
diff --git a/chrome/browser/web_resource/notification_promo.h b/chrome/browser/web_resource/notification_promo.h
index e46da99b350cdaaee0b8052da8c314edc8644a68..5dcd08b6983a4c64a742468184822a010f1c0105 100644
--- a/chrome/browser/web_resource/notification_promo.h
+++ b/chrome/browser/web_resource/notification_promo.h
@@ -59,13 +59,10 @@ class NotificationPromo {
   bool new_notification() const { return new_notification_; }
 
   const std::string& promo_text() const { return promo_text_; }
-#if defined(OS_ANDROID) || defined(OS_IOS)
-  const std::string& promo_text_long() const { return promo_text_long_; }
-  const std::string& promo_action_type() const { return promo_action_type_; }
-  const base::ListValue* promo_action_args() const {
-    return promo_action_args_.get();
+  PromoType promo_type() const { return promo_type_; }
+  const base::DictionaryValue* promo_payload() const {
+    return promo_payload_.get();
   }
-#endif  // defined(OS_ANDROID) || defined(OS_IOS)
 
   // Register preferences.
   static void RegisterUserPrefs(PrefService* prefs);
@@ -73,6 +70,7 @@ class NotificationPromo {
  private:
   // For testing.
   friend class NotificationPromoTest;
+  friend class NotificationPromoMobileNtpTest;
 
   // Check if this promo notification is new based on start/end times,
   // and trigger events accordingly.
@@ -100,11 +98,8 @@ class NotificationPromo {
 
   PromoType promo_type_;
   std::string promo_text_;
-#if defined(OS_ANDROID) || defined(OS_IOS)
-  std::string promo_text_long_;
-  std::string promo_action_type_;
-  scoped_ptr<base::ListValue> promo_action_args_;
-#endif  // defined(OS_ANDROID) || defined(OS_IOS)
+  // Note that |payload| isn't currently used for desktop promos.
+  scoped_ptr<const base::DictionaryValue> promo_payload_;
 
   double start_;
   double end_;