Merge "[NTP:Downloads] Request offline pages even if model is not ..."

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 809 matching lines @@
                        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) {
@@ skipping 81 matching lines @@
                                             HasUrl("http://download.com/2"))));
   CreateLoadedProvider(/*show_assets=*/true, /*show_offline_pages=*/false);
 }
 
 TEST_F(DownloadSuggestionsProviderTest,
        ShouldLoadAndSubmitOfflinePagesEvenIfAssetDownloadsAreTurnedOff) {
   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, ShouldStoreDismissedSuggestions) {
   IgnoreOnCategoryStatusChangedToAvailable();
   IgnoreOnSuggestionInvalidated();
@@ skipping 46 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());
 }