Make NTP Promo invalid if text parameter is not in lookup table.

ios/chrome/browser/ui/ntp/notification_promo_whats_new.mm

 // Copyright (c) 2014 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.
 
 #import "ios/chrome/browser/ui/ntp/notification_promo_whats_new.h"
 
 #include <stdint.h>
 #include <algorithm>
 #include <memory>
 #include <vector>
@@ skipping 24 matching lines @@
 
 // A mapping from a string to a l10n message id.
 const PromoStringToIdsMapEntry kPromoStringToIdsMap[] = {
     {"IDS_IOS_APP_RATING_PROMO_STRING", IDS_IOS_APP_RATING_PROMO_STRING},
     {"IDS_IOS_MOVE_TO_DOCK_FASTER_ACCESS", IDS_IOS_MOVE_TO_DOCK_FASTER_ACCESS},
     {"IDS_IOS_MOVE_TO_DOCK_LOVE_CHROME", IDS_IOS_MOVE_TO_DOCK_LOVE_CHROME},
     {"IDS_IOS_MOVE_TO_DOCK_TIP", IDS_IOS_MOVE_TO_DOCK_TIP},
 };
 
 // Returns a localized version of |promo_text| if it has an entry in the
-// |kPromoStringToIdsMap|. If there is no entry, |promo_text| is returned.
+// |kPromoStringToIdsMap|. If there is no entry, an empty string is returned.
 std::string GetLocalizedPromoText(const std::string& promo_text) {
   for (size_t i = 0; i < arraysize(kPromoStringToIdsMap); ++i) {
     if (kPromoStringToIdsMap[i].promo_text_str == promo_text)
       return l10n_util::GetStringUTF8(kPromoStringToIdsMap[i].message_id);
   }
-  return promo_text;
+  return std::string();
 }
 
 }  // namespace
 
 NotificationPromoWhatsNew::NotificationPromoWhatsNew(PrefService* local_state)
     : local_state_(local_state),
       valid_(false),
       notification_promo_(local_state_) {}
 
 NotificationPromoWhatsNew::~NotificationPromoWhatsNew() {}
@@ skipping 72 matching lines @@
     // |max_seconds_since_install_| seconds ago.
     int64_t install_date = local_state_->GetInt64(metrics::prefs::kInstallDate);
     const base::Time last_view_time =
         base::Time::FromTimeT(install_date) +
         base::TimeDelta::FromSeconds(max_seconds_since_install_);
     if (last_view_time < base::Time::Now()) {
       return false;
     }
   }
 
-  if (promo_name_ == "WKWVGotFasterPromo") {
-    // Promo is not relevant anymore: It was shown during the migration to the
-    // WKWebview.
-    return false;
-  }
-
   return true;
 }
 
 void NotificationPromoWhatsNew::HandleViewed() {
   // TODO(justincohen): metrics actions names should be inlined. Since
   // metric_name_ is retrieved from a server, it's not possible to know at build
   // time the values. We should investigate to find a solution. In the meantime,
   // metrics will be reported hashed.
   // http://crbug.com/437500
   std::string metric = std::string("WhatsNewPromoViewed_") + metric_name_;
@@ skipping 28 matching lines @@
     return WHATS_NEW_LOGO;
   } else if (icon_name == "logoWithRoundedRectangle") {
     return WHATS_NEW_LOGO_ROUNDED_RECTANGLE;
   }
   return WHATS_NEW_INFO;
 }
 
 bool NotificationPromoWhatsNew::InitFromNotificationPromo() {
   valid_ = false;
 
+  promo_text_ = GetLocalizedPromoText(notification_promo_.promo_text());
+  if (promo_text_.empty())
+    return valid_;
+
+  notification_promo_.promo_payload()->GetString("metric_name", &metric_name_);
+  if (metric_name_.empty())
+    return valid_;
+
   notification_promo_.promo_payload()->GetString("promo_type", &promo_type_);
-  notification_promo_.promo_payload()->GetString("metric_name", &metric_name_);
-  promo_text_ = GetLocalizedPromoText(notification_promo_.promo_text());
-
   if (IsURLPromo()) {
     std::string url_text;
     notification_promo_.promo_payload()->GetString("url", &url_text);
     url_ = GURL(url_text);
     if (url_.is_empty() || !url_.is_valid()) {
-      valid_ = false;
       return valid_;
     }
-  }
-
-  if (IsChromeCommand()) {
+  } else if (IsChromeCommand()) {
     std::string command;
     notification_promo_.promo_payload()->GetString("command", &command);
     if (command == "bookmark") {
       command_id_ = IDC_SHOW_BOOKMARK_MANAGER;
     } else if (command == "ratethisapp") {
       command_id_ = IDC_RATE_THIS_APP;
     } else {
-      valid_ = false;
       return valid_;
     }
+  } else {  // If |promo_type_| is not set to URL or Command, return early.
+    return valid_;
   }
 
-  valid_ =
-      !metric_name_.empty() && !promo_type_.empty() && !promo_text_.empty();
+  valid_ = true;
 
-  notification_promo_.promo_payload()->GetString("promo_name", &promo_name_);
+  // Optional values don't need validation.
   std::string icon_name;
   notification_promo_.promo_payload()->GetString("icon", &icon_name);
   icon_ = ParseIconName(icon_name);
 
-  // Optional values don't need validation.
   seconds_since_install_ = 0;
   notification_promo_.promo_payload()->GetInteger("seconds_since_install",
                                                   &seconds_since_install_);
   max_seconds_since_install_ = 0;
   notification_promo_.promo_payload()->GetInteger("max_seconds_since_install",
                                                   &max_seconds_since_install_);
   return valid_;
 }
 
 void NotificationPromoWhatsNew::InjectFakePromo(const std::string& promo_id,
@@ skipping 34 matching lines @@
       base::ReplaceStringPlaceholders(promo_json, replacements, NULL);
 
   std::unique_ptr<base::Value> value(
       base::JSONReader::Read(promo_json_filled_in));
   base::DictionaryValue* dict = NULL;
   if (value->GetAsDictionary(&dict)) {
     notification_promo_.InitFromJson(
         *dict, ios::NotificationPromo::MOBILE_NTP_WHATS_NEW_PROMO);
   }
 }