Adding a request counter to the snippets fetcher.

components/ntp_snippets/ntp_snippets_service.cc

 // Copyright 2015 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 "components/ntp_snippets/ntp_snippets_service.h"
 
 #include <algorithm>
 #include <iterator>
 #include <utility>
 
@@ skipping 229 matching lines @@
   registry->RegisterListPref(prefs::kSnippetHosts);
 
   NTPSnippetsStatusService::RegisterProfilePrefs(registry);
 }
 
 // Inherited from KeyedService.
 void NTPSnippetsService::Shutdown() {
   EnterState(State::SHUT_DOWN, ContentSuggestionsCategoryStatus::NOT_PROVIDED);
 }
 
-void NTPSnippetsService::FetchSnippets() {
+void NTPSnippetsService::FetchSnippets(bool force_request) {
   if (ready())
-    FetchSnippetsFromHosts(GetSuggestionsHosts());
+    FetchSnippetsFromHosts(GetSuggestionsHosts(), force_request);
   else
     fetch_after_load_ = true;
 }
 
 void NTPSnippetsService::FetchSnippetsFromHosts(
-    const std::set<std::string>& hosts) {
+    const std::set<std::string>& hosts,
+    bool force_request) {
   if (!ready())
     return;
   snippets_fetcher_->FetchSnippetsFromHosts(hosts, application_language_code_,
-                                            kMaxSnippetCount);
+                                            kMaxSnippetCount, force_request);
 }
 
 void NTPSnippetsService::RescheduleFetching() {
   // The scheduler only exists on Android so far, it's null on other platforms.
   if (!scheduler_)
     return;
 
   if (ready()) {
     base::Time now = base::Time::Now();
     scheduler_->Schedule(
@@ skipping 159 matching lines @@
       to_delete.emplace_back(std::move(snippet));
   }
   Compact(&snippets_);
   // Then delete the removed snippets from the database.
   database_->DeleteSnippets(to_delete);
 
   StoreSnippetHostsToPrefs(hosts);
 
   NotifyNewSuggestions();
 
-  FetchSnippetsFromHosts(hosts);
+  FetchSnippetsFromHosts(hosts, false);

[Marc Treib, 2016/07/22 13:52:52]

/* force_request */ ?

[jkrcal, 2016/07/25 10:05:38]

Done.

 }
 
 void NTPSnippetsService::OnFetchFinished(
     NTPSnippetsFetcher::OptionalSnippets snippets) {
   if (!ready())
     return;
 
   if (snippets) {
     // Sparse histogram used because the number of snippets is small (bound by
     // kMaxSnippetCount).
@@ skipping 192 matching lines @@
     return;
   }
 
   const NTPSnippet& snippet = *it->get();
   image_fetcher_->StartOrQueueNetworkRequest(
       snippet.id(), snippet.salient_image_url(), callback);
 }
 
 void NTPSnippetsService::EnterStateEnabled(bool fetch_snippets) {
   if (fetch_snippets)
-    FetchSnippets();
+    FetchSnippets(false);

[Marc Treib, 2016/07/22 13:52:52]

here too

[jkrcal, 2016/07/25 10:05:38]

Done.

 
   // If host restrictions are enabled, register for host list updates.
   // |suggestions_service_| can be null in tests.
   if (snippets_fetcher_->UsesHostRestrictions() && suggestions_service_) {
     suggestions_service_subscription_ =
         suggestions_service_->AddCallback(base::Bind(
             &NTPSnippetsService::OnSuggestionsChanged, base::Unretained(this)));
   }
 
   RescheduleFetching();
@@ skipping 156 matching lines @@
 }
 
 void NTPSnippetsService::NotifyCategoryStatusChanged() {
   if (observer_) {
     observer_->OnCategoryStatusChanged(ContentSuggestionsCategory::ARTICLES,
                                        category_status_);
   }
 }
 
 }  // namespace ntp_snippets