Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(639)

Unified Diff: components/ntp_snippets/remote/ntp_snippets_service.cc

Issue 2387293009: Removes a data-dependent DCHECK(). (Closed)
Patch Set: merged to head Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/ntp_snippets/remote/ntp_snippets_service.cc
diff --git a/components/ntp_snippets/remote/ntp_snippets_service.cc b/components/ntp_snippets/remote/ntp_snippets_service.cc
index 1452416159fc58c71e072d54dc589e705110a387..601b47dc9f03dc7793c60cfd7ad05afd54543654 100644
--- a/components/ntp_snippets/remote/ntp_snippets_service.cc
+++ b/components/ntp_snippets/remote/ntp_snippets_service.cc
@@ -499,7 +499,7 @@ void NTPSnippetsService::OnDatabaseError() {
}
void NTPSnippetsService::OnFetchFinished(
- NTPSnippetsFetcher::OptionalSnippets snippets) {
+ NTPSnippetsFetcher::OptionalFetchedCategories fetched_categories) {
if (!ready())
return;
@@ -513,10 +513,11 @@ void NTPSnippetsService::OnFetchFinished(
// If snippets were fetched successfully, update our |categories_| from each
// category provided by the server.
- if (snippets) {
+ if (fetched_categories) {
// TODO(jkrcal): A bit hard to understand with so many variables called
// "*categor*". Isn't here some room for simplification?
- for (NTPSnippetsFetcher::FetchedCategory& fetched_category : *snippets) {
+ for (NTPSnippetsFetcher::FetchedCategory& fetched_category :
+ *fetched_categories) {
Category category = fetched_category.category;
// TODO(sfiera): Avoid hard-coding articles category checks in so many
@@ -528,13 +529,13 @@ void NTPSnippetsService::OnFetchFinished(
}
categories_[category].provided_by_server = true;
- DCHECK_LE(snippets->size(), static_cast<size_t>(kMaxSnippetCount));
- // TODO(sfiera): histograms for server categories.
- // Sparse histogram used because the number of snippets is small (bound by
- // kMaxSnippetCount).
+ // TODO(tschumann): Remove this histogram once we only talk to the content
+ // suggestions cloud backend.
if (category == articles_category_) {
- UMA_HISTOGRAM_SPARSE_SLOWLY("NewTabPage.Snippets.NumArticlesFetched",
- fetched_category.snippets.size());
+ UMA_HISTOGRAM_SPARSE_SLOWLY(
+ "NewTabPage.Snippets.NumArticlesFetched",
+ std::min(fetched_category.snippets.size(),
+ static_cast<size_t>(kMaxSnippetCount + 1)));
}
ReplaceSnippets(category, std::move(fetched_category.snippets));
}
@@ -561,7 +562,7 @@ void NTPSnippetsService::OnFetchFinished(
// fetches, to make sure the fallback interval triggers only if no wifi fetch
// succeeded, and also that we don't do a background fetch immediately after
// a user-initiated one.
- if (snippets)
+ if (fetched_categories)
RescheduleFetching(true);
}
« no previous file with comments | « components/ntp_snippets/remote/ntp_snippets_service.h ('k') | components/ntp_snippets/remote/ntp_snippets_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698