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

chrome/browser/ntp_snippets/download_suggestions_provider_unittest.cc

 // Copyright 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 "chrome/browser/ntp_snippets/download_suggestions_provider.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
@@ skipping 792 matching lines @@
   provider()->DismissSuggestion(
       GetDummySuggestionId(1, /*is_offline_page=*/false));
   provider()->DismissSuggestion(
       GetDummySuggestionId(2, /*is_offline_page=*/false));
   EXPECT_THAT(GetDismissedSuggestions(), SizeIs(2));
 
   downloads_manager()->items()[0]->NotifyDownloadDestroyed();
   EXPECT_THAT(GetDismissedSuggestions(), SizeIs(1));
 }
 
-TEST_F(DownloadSuggestionsProviderTest,
-       ShouldFetchAssetDownloadsOnStartupButOnlyOnce) {
+TEST_F(DownloadSuggestionsProviderTest, ShouldFetchAssetDownloadsOnStartup) {
   IgnoreOnCategoryStatusChangedToAvailable();
 
   *(downloads_manager()->mutable_items()) = CreateDummyAssetDownloads({1, 2});
   EXPECT_CALL(
       *observer(),
       OnNewSuggestions(_, downloads_category(),
                        UnorderedElementsAre(HasUrl("http://download.com/1"),
                                             HasUrl("http://download.com/2"))));
   CreateLoadedProvider(/*show_assets=*/true, /*show_offline_pages=*/true);
 }
 
 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();
 
   EXPECT_CALL(*observer(), OnNewSuggestions(_, _, _)).Times(0);
   CreateProvider(/*show_assets=*/true, /*show_offline_pages=*/true);
 
   *(downloads_manager()->mutable_items()) = CreateDummyAssetDownloads({1, 2});
   EXPECT_CALL(
       *observer(),
       OnNewSuggestions(_, downloads_category(),
@@ skipping 52 matching lines @@
                                                 HasUrl("http://dummy.com/2"))));
   CreateProvider(/*show_assets=*/false, /*show_offline_pages=*/true);
   downloads_manager()->NotifyDownloadCreated(
       downloads_manager()->items()[0].get());
   // This notification should not reach the provider, because the asset
   // downloads data source is not provided. If it is and the provider reacts to
   // the notification, the test will fail because the observer is a strict mock.
   (*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();
   IgnoreOnSuggestionInvalidated();
 
   *(downloads_manager()->mutable_items()) = CreateDummyAssetDownloads({1, 2});
   EXPECT_CALL(
       *observer(),
       OnNewSuggestions(_, downloads_category(),
                        UnorderedElementsAre(HasUrl("http://download.com/1"),
@@ skipping 67 matching lines @@
 
   EXPECT_CALL(*observer(), OnNewSuggestions(_, _, _));
 
   downloads_manager()->mutable_items()->clear();
   FireHistoryQueryComplete();
 
   *(downloads_manager()->mutable_items()) = CreateDummyAssetDownloads({1});
   // Once the manager has been loaded, the ids should be pruned.
   EXPECT_THAT(GetDismissedSuggestions(), IsEmpty());
 }