Remove unnecessary promo_type_ field from notification_promo.h/.cc.

ios/chrome/browser/notification_promo.cc

 // Copyright (c) 2016 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 "ios/chrome/browser/notification_promo.h"
 
 #include <stddef.h>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 16 matching lines @@
 // Keys in the kPrefPromoObject dictionary; used only here.
 const char kPrefPromoID[] = "id";
 const char kPrefPromoFirstViewTime[] = "first_view_time";
 const char kPrefPromoViews[] = "views";
 const char kPrefPromoClosed[] = "closed";
 
 }  // namespace
 
 NotificationPromo::NotificationPromo(PrefService* local_state)
     : local_state_(local_state),
-      promo_type_(NO_PROMO),
       promo_payload_(new base::DictionaryValue()),
       start_(0.0),
       end_(0.0),
       promo_id_(-1),
       max_views_(0),
       max_seconds_(0),
       first_view_time_(0),
       views_(0),
       closed_(false) {
   DCHECK(local_state_);
@@ skipping 24 matching lines @@
     base::DictionaryValue& json_or_payload =
         IsPayloadParam(iter->first) ? payload : json;
     if (converted) {
       json_or_payload.SetInteger(iter->first, converted_number);
     } else {
       json_or_payload.SetString(iter->first, iter->second);
     }
   }
   json.Set("payload", payload.DeepCopy());
 
-  InitFromJson(json, MOBILE_NTP_WHATS_NEW_PROMO);
+  InitFromJson(json);
 }
 
-void NotificationPromo::InitFromJson(const base::DictionaryValue& promo,
-                                     PromoType promo_type) {
-  promo_type_ = promo_type;
-
+void NotificationPromo::InitFromJson(const base::DictionaryValue& promo) {
   std::string time_str;
   base::Time time;
   if (promo.GetString("start", &time_str) &&
       base::Time::FromString(time_str.c_str(), &time)) {
     start_ = time.ToDoubleT();
     DVLOG(1) << "start str=" << time_str
              << ", start_=" << base::DoubleToString(start_);
   }
   if (promo.GetString("end", &time_str) &&
       base::Time::FromString(time_str.c_str(), &time)) {
@@ skipping 49 matching lines @@
   ntp_promo->SetInteger(kPrefPromoViews, views);
   ntp_promo->SetBoolean(kPrefPromoClosed, closed);
 
   base::DictionaryValue promo_dict;
   promo_dict.MergeDictionary(local_state_->GetDictionary(kPrefPromoObject));
   promo_dict.Set(base::IntToString(promo_id), ntp_promo);
   local_state_->Set(kPrefPromoObject, promo_dict);
   DVLOG(1) << "WritePrefs " << promo_dict;
 }
 
-void NotificationPromo::InitFromPrefs(PromoType promo_type) {
-  promo_type_ = promo_type;

[justincohen, 2017/04/10 15:32:13]

Was this data ever stored in prefs?

[gchatz, 2017/04/10 18:32:24]

It was in the old pref structure, but not since we supported having multiple
promos. If a user upgrades to this version the old pref structure, it would be
blown away and resaved in the new structure.

-
+void NotificationPromo::InitFromPrefs() {
   // Check if data is stored in the old prefs structure, and migrate it before
   // reading from prefs.
   MigrateOldPrefs();
 
   // If |promo_id_| is not set, do nothing.
   if (promo_id_ == -1)
     return;
 
   const base::DictionaryValue* promo_dict =
       local_state_->GetDictionary(kPrefPromoObject);
@@ skipping 95 matching lines @@
 
 double NotificationPromo::StartTime() const {
   return start_;
 }
 
 double NotificationPromo::EndTime() const {
   return end_;
 }
 
 }  // namespace ios