Merge "[NTP::Downloads] Do not fetch Offline Pages when their model ..."

chrome/browser/ntp_snippets/download_suggestions_provider_unittest.cc

Index: chrome/browser/ntp_snippets/download_suggestions_provider_unittest.cc
diff --git a/chrome/browser/ntp_snippets/download_suggestions_provider_unittest.cc b/chrome/browser/ntp_snippets/download_suggestions_provider_unittest.cc
index 3afefa76b8b2927de7dfa9cdf662bdfca1ad0f5e..f63cfce992910b00eccfb5a3ca2ceb4bef4fa123 100644
--- a/chrome/browser/ntp_snippets/download_suggestions_provider_unittest.cc
+++ b/chrome/browser/ntp_snippets/download_suggestions_provider_unittest.cc
@@ -810,8 +810,7 @@ TEST_F(DownloadSuggestionsProviderTest, ShouldPruneAssetDownloadsDismissedIDs) {
   EXPECT_THAT(GetDismissedSuggestions(), SizeIs(1));
 }
 
-TEST_F(DownloadSuggestionsProviderTest,
-       ShouldFetchAssetDownloadsOnStartupButOnlyOnce) {
+TEST_F(DownloadSuggestionsProviderTest, ShouldFetchAssetDownloadsOnStartup) {
   IgnoreOnCategoryStatusChangedToAvailable();
 
   *(downloads_manager()->mutable_items()) = CreateDummyAssetDownloads({1, 2});
@@ -824,6 +823,20 @@ TEST_F(DownloadSuggestionsProviderTest,
 }
 
 TEST_F(DownloadSuggestionsProviderTest,
+       ShouldFetchOfflinePageDownloadsOnStartup) {
+  IgnoreOnCategoryStatusChangedToAvailable();
+
+  *(offline_pages_model()->mutable_items()) = CreateDummyOfflinePages({1, 2});
+  offline_pages_model()->set_is_loaded(true);
+  EXPECT_CALL(*observer(), OnNewSuggestions(_, downloads_category(),
+                                            UnorderedElementsAre(
+                                                HasUrl("http://dummy.com/1"),
+                                                HasUrl("http://dummy.com/2"))));
+  CreateProvider(/*show_assets=*/false, /*show_offline_pages=*/true);
+  FireOfflinePageModelLoaded();
+}
+
+TEST_F(DownloadSuggestionsProviderTest,
        ShouldFetchAssetDownloadsOnHistoryQueryComplete) {
   IgnoreOnCategoryStatusChangedToAvailable();
 
@@ -896,38 +909,6 @@ TEST_F(DownloadSuggestionsProviderTest, ShouldNotShowAssetsWhenTurnedOff) {
   (*downloads_manager()->mutable_items())[0]->NotifyDownloadUpdated();
 }
 
-TEST_F(DownloadSuggestionsProviderTest, ShouldLoadOfflinePagesOnModelLoaded) {
-  IgnoreOnCategoryStatusChangedToAvailable();
-  IgnoreOnSuggestionInvalidated();
-
-  offline_pages_model()->set_is_loaded(false);
-  EXPECT_CALL(*observer(),
-              OnNewSuggestions(_, downloads_category(), IsEmpty()));
-  CreateProvider(/*show_assets=*/false, /*show_offline_pages=*/true);
-
-  *(offline_pages_model()->mutable_items()) = CreateDummyOfflinePages({1, 2});
-  offline_pages_model()->set_is_loaded(true);
-  EXPECT_CALL(*observer(), OnNewSuggestions(_, downloads_category(),
-                                            UnorderedElementsAre(
-                                                HasUrl("http://dummy.com/1"),
-                                                HasUrl("http://dummy.com/2"))));
-  FireOfflinePageModelLoaded();
-}
-
-TEST_F(DownloadSuggestionsProviderTest,
-       ShouldLoadOfflinePagesIfMissesOnModelLoaded) {
-  IgnoreOnCategoryStatusChangedToAvailable();
-  IgnoreOnSuggestionInvalidated();
-
-  *(offline_pages_model()->mutable_items()) = CreateDummyOfflinePages({1, 2});
-  offline_pages_model()->set_is_loaded(true);
-  EXPECT_CALL(*observer(), OnNewSuggestions(_, downloads_category(),
-                                            UnorderedElementsAre(
-                                                HasUrl("http://dummy.com/1"),
-                                                HasUrl("http://dummy.com/2"))));
-  CreateProvider(/*show_assets=*/false, /*show_offline_pages=*/true);
-}
-
 TEST_F(DownloadSuggestionsProviderTest,
        ShouldLoadAndSubmitMissedAssetsEvenIfOfflinePagesAreTurnedOff) {
   IgnoreOnCategoryStatusChangedToAvailable();