Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Unified Diff: ios/chrome/browser/notification_promo_unittest.cc

Issue 2805443007: Remove unnecessary promo_type_ field from notification_promo.h/.cc. (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/notification_promo_unittest.cc
diff --git a/ios/chrome/browser/notification_promo_unittest.cc b/ios/chrome/browser/notification_promo_unittest.cc
index d5356e8e6dcbd2ff4e31404b892ffd9bd4927e37..3299c13234912603fa44f8c36ee18b6625b75d52 100644
--- a/ios/chrome/browser/notification_promo_unittest.cc
+++ b/ios/chrome/browser/notification_promo_unittest.cc
@@ -111,7 +111,6 @@ class NotificationPromoTest : public testing::Test {
field_trial_params);
base::FieldTrialList::CreateFieldTrial("IOSNTPPromotion", "Group1");
- promo_type_ = NotificationPromo::MOBILE_NTP_WHATS_NEW_PROMO;
promo_text_ = promo_text;
start_ = start;
@@ -133,7 +132,7 @@ class NotificationPromoTest : public testing::Test {
}
void InitPromoFromJson() {
- notification_promo_.InitFromJson(*test_json_, promo_type_);
+ notification_promo_.InitFromJson(*test_json_);
// Test the fields.
TestServerProvidedParameters();
@@ -158,7 +157,7 @@ class NotificationPromoTest : public testing::Test {
// Initialize promo from saved prefs and server params.
NotificationPromo first_promo(&local_state_);
first_promo.InitFromVariations();
- first_promo.InitFromPrefs(promo_type_);
+ first_promo.InitFromPrefs();
EXPECT_EQ(first_promo.max_views_ - 2, first_promo.views_);
EXPECT_TRUE(first_promo.CanShow());
first_promo.HandleViewed();
@@ -167,14 +166,14 @@ class NotificationPromoTest : public testing::Test {
// correctly in prefs.
NotificationPromo second_promo(&local_state_);
second_promo.InitFromVariations();
- second_promo.InitFromPrefs(promo_type_);
+ second_promo.InitFromPrefs();
EXPECT_EQ(second_promo.max_views_ - 1, second_promo.views_);
EXPECT_TRUE(second_promo.CanShow());
second_promo.HandleViewed();
NotificationPromo third_promo(&local_state_);
third_promo.InitFromVariations();
- third_promo.InitFromPrefs(promo_type_);
+ third_promo.InitFromPrefs();
EXPECT_EQ(third_promo.max_views_, third_promo.views_);
EXPECT_FALSE(third_promo.CanShow());
@@ -199,7 +198,7 @@ class NotificationPromoTest : public testing::Test {
// Initialize promo from saved prefs and server params.
NotificationPromo first_promo(&local_state_);
first_promo.InitFromVariations();
- first_promo.InitFromPrefs(promo_type_);
+ first_promo.InitFromPrefs();
EXPECT_FALSE(first_promo.closed_);
EXPECT_TRUE(first_promo.CanShow());
first_promo.HandleClosed();
@@ -208,7 +207,7 @@ class NotificationPromoTest : public testing::Test {
// recorded correctly in prefs.
NotificationPromo second_promo(&local_state_);
second_promo.InitFromVariations();
- second_promo.InitFromPrefs(promo_type_);
+ second_promo.InitFromPrefs();
EXPECT_TRUE(second_promo.closed_);
EXPECT_FALSE(second_promo.CanShow());
@@ -276,7 +275,7 @@ class NotificationPromoTest : public testing::Test {
NotificationPromo temp_promo(&local_state_);
temp_promo.InitFromVariations();
- temp_promo.InitFromPrefs(promo_type_);
+ temp_promo.InitFromPrefs();
EXPECT_NE(0, temp_promo.first_view_time_);
notification_promo_.views_ = 0;
@@ -316,7 +315,7 @@ class NotificationPromoTest : public testing::Test {
// Initialize promo and verify that its instance variables match the data
// saved in the old structure.
- promo.InitFromPrefs(promo_type_);
+ promo.InitFromPrefs();
EXPECT_DOUBLE_EQ(first_view_time, promo.first_view_time_);
EXPECT_EQ(views, promo.views_);
EXPECT_EQ(closed, promo.closed_);
@@ -343,7 +342,6 @@ class NotificationPromoTest : public testing::Test {
bool received_notification_;
std::unique_ptr<base::DictionaryValue> test_json_;
- NotificationPromo::PromoType promo_type_;
std::string promo_text_;
double start_;

Powered by Google App Engine
This is Rietveld 408576698