Stop showing release notes notification afer oobe

Bug: 1047373
Change-Id: Iff288056d2006c9c97aa0f517e8d7f66e592f143
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2032046
Commit-Queue: Yulun Wu <yulunwu@chromium.org>
Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737096}

chrome/browser/chromeos/release_notes/release_notes_notification_unittest.cc

@@ -8,6 +8,7 @@
 #include "base/test/scoped_feature_list.h"
 #include "chrome/browser/notifications/notification_display_service_tester.h"
 #include "chrome/browser/notifications/system_notification_helper.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_browser_process.h"
@@ -66,9 +67,18 @@ class ReleaseNotesNotificationTest : public BrowserWithTestWindowTest {
   DISALLOW_COPY_AND_ASSIGN(ReleaseNotesNotificationTest);
 };
 
+TEST_F(ReleaseNotesNotificationTest, DoNotShowReleaseNotesNotification) {
+  release_notes_notification_->MaybeShowReleaseNotes();
+  EXPECT_EQ(false, HasReleaseNotesNotification());
+  EXPECT_EQ(0, notification_count_);
+}
+
 TEST_F(ReleaseNotesNotificationTest, ShowReleaseNotesNotification) {
+  std::unique_ptr<ReleaseNotesStorage> release_notes_storage =
+      std::make_unique<ReleaseNotesStorage>(profile());
+  profile()->GetPrefs()->SetInteger(prefs::kReleaseNotesLastShownMilestone, -1);
   release_notes_notification_->MaybeShowReleaseNotes();
-  ASSERT_TRUE(HasReleaseNotesNotification());
+  EXPECT_EQ(true, HasReleaseNotesNotification());
   EXPECT_EQ(1, notification_count_);
 }
 

chrome/browser/chromeos/release_notes/release_notes_storage.cc

@@ -34,7 +34,8 @@ constexpr int kTimesToShowSuggestionChip = 1;
 namespace chromeos {
 
 void ReleaseNotesStorage::RegisterProfilePrefs(PrefRegistrySimple* registry) {
-  registry->RegisterIntegerPref(prefs::kReleaseNotesLastShownMilestone, 0);
+  registry->RegisterIntegerPref(prefs::kReleaseNotesLastShownMilestone,
+                                GetMilestone());
   registry->RegisterIntegerPref(
       prefs::kReleaseNotesSuggestionChipTimesLeftToShow, 0);
 }

chrome/browser/chromeos/release_notes/release_notes_storage_unittest.cc

@@ -77,6 +77,21 @@ TEST_P(ReleaseNotesStorageTest, ModifyLastRelease) {
   EXPECT_EQ(false, release_notes_storage->ShouldNotify());
 }
 
+// Release notes sets current milestone to "last shown" after OOBE and should
+// not be shown.
+TEST_P(ReleaseNotesStorageTest, ShouldNotShowReleaseNotesOOBE) {
+  const bool should_show_notification = GetParam();
+  SetupFeatureFlag(should_show_notification);
+
+  std::unique_ptr<Profile> profile = CreateProfile("test@gmail.com");
+
+  profile->GetProfilePolicyConnector()->OverrideIsManagedForTesting(false);
+  std::unique_ptr<ReleaseNotesStorage> release_notes_storage =
+      std::make_unique<ReleaseNotesStorage>(profile.get());
+
+  EXPECT_EQ(false, release_notes_storage->ShouldNotify());
+}
+
 TEST_P(ReleaseNotesStorageTest, ShouldShowReleaseNotes) {
   const bool should_show_notification = GetParam();
   SetupFeatureFlag(should_show_notification);