Defer effects of HandleViewed/HandleClosed until prefs are loaded again.

ios/chrome/browser/notification_promo_unittest.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 <stddef.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/json/json_reader.h"
@@ skipping 144 matching lines @@
   }
 
   void TestViews() {
     notification_promo_.views_ = notification_promo_.max_views_ - 2;
     notification_promo_.WritePrefs();
 
     // Initialize promo from saved prefs and server params.
     NotificationPromo first_promo(&local_state_);
     first_promo.InitFromVariations();
     first_promo.InitFromPrefs(promo_type_);
-
-    first_promo.HandleViewed();
-    EXPECT_EQ(first_promo.max_views_ - 1, first_promo.views_);
+    EXPECT_EQ(first_promo.max_views_ - 2, first_promo.views_);
     EXPECT_TRUE(first_promo.CanShow());
     first_promo.HandleViewed();
 
     // Initialize another promo to test that the new views were recorded
     // correctly in prefs.
     NotificationPromo second_promo(&local_state_);
     second_promo.InitFromVariations();
     second_promo.InitFromPrefs(promo_type_);
-    EXPECT_EQ(second_promo.max_views_, second_promo.views_);
-    EXPECT_FALSE(second_promo.CanShow());
+    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_);
+    EXPECT_EQ(third_promo.max_views_, third_promo.views_);
+    EXPECT_FALSE(third_promo.CanShow());
 
     // Test out of range views.
     for (int i = max_views_; i < max_views_ * 2; ++i) {
-      second_promo.views_ = i;
-      EXPECT_FALSE(second_promo.CanShow());
+      third_promo.views_ = i;
+      EXPECT_FALSE(third_promo.CanShow());
     }
 
     // Test in range views.
     for (int i = 0; i < max_views_; ++i) {
-      second_promo.views_ = i;
-      EXPECT_TRUE(second_promo.CanShow());
+      third_promo.views_ = i;
+      EXPECT_TRUE(third_promo.CanShow());
     }
 
     // Reset prefs to default.
     notification_promo_.views_ = 0;
     notification_promo_.WritePrefs();
   }
 
   void TestClosed() {
     // Initialize promo from saved prefs and server params.
     NotificationPromo first_promo(&local_state_);
     first_promo.InitFromVariations();
     first_promo.InitFromPrefs(promo_type_);
     EXPECT_FALSE(first_promo.closed_);
     EXPECT_TRUE(first_promo.CanShow());
-
     first_promo.HandleClosed();
-    EXPECT_TRUE(first_promo.closed_);
-    EXPECT_FALSE(first_promo.CanShow());
 
     // Initialize another promo to test that the the closing of the promo was
     // recorded correctly in prefs.
     NotificationPromo second_promo(&local_state_);
     second_promo.InitFromVariations();
     second_promo.InitFromPrefs(promo_type_);
     EXPECT_TRUE(second_promo.closed_);
     EXPECT_FALSE(second_promo.CanShow());
 
     // Reset prefs to default.
@@ skipping 50 matching lines @@
     notification_promo_.first_view_time_ = 0;
     notification_promo_.max_seconds_ = max_seconds_;
     EXPECT_TRUE(notification_promo_.CanShow());
   }
 
   // Tests that the first view time is recorded properly in prefs when the
   // first view occurs.
   void TestFirstViewTimeRecorded() {
     EXPECT_EQ(0, notification_promo_.first_view_time_);
     notification_promo_.HandleViewed();
-    EXPECT_NE(0, notification_promo_.first_view_time_);
-    double first_viewed = notification_promo_.first_view_time_;
 
     NotificationPromo temp_promo(&local_state_);
     temp_promo.InitFromVariations();
     temp_promo.InitFromPrefs(promo_type_);
-
-    EXPECT_EQ(first_viewed, temp_promo.first_view_time_);
+    EXPECT_NE(0, temp_promo.first_view_time_);
 
     notification_promo_.views_ = 0;
     notification_promo_.first_view_time_ = 0;
     notification_promo_.WritePrefs();
   }
 
   // Tests that if data is saved in the old pref structure, it is successfully
   // migrated to the new structure that supports saving multiple promos.
   // TODO(crbug.com/623726) Remove this method when migration is no longer
   // needed as most users have been upgraded to the new pref structure.
@@ skipping 146 matching lines @@
       "  \"promo_id\":0"
       "}",
       "What do you think of Chrome?",
       933672366,  // unix epoch for 3 Aug 1999 9:26:06 GMT.
       0, 30, 30);
   InitPromoFromVariations();
   TestMigrationOfOldPrefs();
 }
 
 }  // namespace ios