Connecting UserClassifier to NtpSnippetsFetcher

components/ntp_snippets/remote/request_throttler.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 "components/ntp_snippets/remote/request_throttler.h"
 
 #include <climits>
+#include <set>
 #include <vector>
 
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "components/ntp_snippets/ntp_snippets_constants.h"
 #include "components/ntp_snippets/pref_names.h"
 #include "components/prefs/pref_registry_simple.h"
@@ skipping 25 matching lines @@
     const char* count_pref;
     const char* interactive_count_pref;
     const char* day_pref;
     const int default_quota;
     const int default_interactive_quota;
 };
 
 // When adding a new type here, extend also the "RequestThrottlerTypes"
 // <histogram_suffixes> in histograms.xml with the |name| string.
 const RequestThrottler::RequestTypeInfo RequestThrottler::kRequestTypeInfo[] = {
-    // RequestCounter::RequestType::CONTENT_SUGGESTION_FETCHER,
-    {"SuggestionFetcher", prefs::kSnippetFetcherRequestCount,
+    // The following three types share the same prefs. They differ in quota
+    // values (and UMA histograms).
+    // RequestCounter::RequestType::CONTENT_SUGGESTION_FETCHER_RARE_NTP_USER,
+    {"SuggestionFetcherRareNTPUser", prefs::kSnippetFetcherRequestCount,
      prefs::kSnippetFetcherInteractiveRequestCount,
-     prefs::kSnippetFetcherRequestsDay, 50, kUnlimitedQuota},
-     // RequestCounter::RequestType::CONTENT_SUGGESTION_THUMBNAIL,
+     prefs::kSnippetFetcherRequestsDay, 5, kUnlimitedQuota},
+    // RequestCounter::RequestType::CONTENT_SUGGESTION_FETCHER_ACTIVE_NTP_USER,
+    {"SuggestionFetcherActiveNTPUser", prefs::kSnippetFetcherRequestCount,
+     prefs::kSnippetFetcherInteractiveRequestCount,
+     prefs::kSnippetFetcherRequestsDay, 20, kUnlimitedQuota},
+    // RequestCounter::RequestType::CONTENT_SUGGESTION_FETCHER_ACTIVE_SUGGESTIONS_CONSUMER,
+    {"SuggestionFetcherActiveSuggestionsConsumer",
+     prefs::kSnippetFetcherRequestCount,
+     prefs::kSnippetFetcherInteractiveRequestCount,
+     prefs::kSnippetFetcherRequestsDay, 20, kUnlimitedQuota},
+    // RequestCounter::RequestType::CONTENT_SUGGESTION_THUMBNAIL,
     {"SuggestionThumbnailFetcher", prefs::kSnippetThumbnailsRequestCount,
      prefs::kSnippetThumbnailsInteractiveRequestCount,
      prefs::kSnippetThumbnailsRequestsDay, kUnlimitedQuota, kUnlimitedQuota}};
 
 RequestThrottler::RequestThrottler(PrefService* pref_service, RequestType type)
     : pref_service_(pref_service),
       type_info_(kRequestTypeInfo[static_cast<int>(type)]) {
   DCHECK(pref_service);
 
   std::string quota = variations::GetVariationParamValue(
@@ skipping 32 matching lines @@
       1, 100, 50, base::HistogramBase::kUmaTargetedHistogramFlag);
   // Corresponds to UMA_HISTOGRAM_COUNTS_100(name, sample).
   histogram_per_day_interactive_ = base::Histogram::FactoryGet(
       base::StringPrintf("NewTabPage.RequestThrottler.PerDayInteractive_%s",
                          GetRequestTypeName()),
       1, 100, 50, base::HistogramBase::kUmaTargetedHistogramFlag);
 }
 
 // static
 void RequestThrottler::RegisterProfilePrefs(PrefRegistrySimple* registry) {
+  // Collect all pref keys in a set to make sure we register each key exactly
+  // once, even if they repeat.
+  std::set<std::string> keys_to_register;
   for (const RequestTypeInfo& info : kRequestTypeInfo) {
-    registry->RegisterIntegerPref(info.count_pref, 0);
-    registry->RegisterIntegerPref(info.interactive_count_pref, 0);
-    registry->RegisterIntegerPref(info.day_pref, 0);
+    keys_to_register.insert(info.day_pref);
+    keys_to_register.insert(info.count_pref);
+    keys_to_register.insert(info.interactive_count_pref);
   }
+
+  for (const std::string& key : keys_to_register)
+    registry->RegisterIntegerPref(key, 0);
 }
 
 bool RequestThrottler::DemandQuotaForRequest(bool interactive_request) {
   ResetCounterIfDayChanged();
 
   int new_count = GetCount(interactive_request) + 1;
   SetCount(interactive_request, new_count);
   bool available = (new_count <= GetQuota(interactive_request));
 
   if (interactive_request) {
@@ skipping 55 matching lines @@
 
 void RequestThrottler::SetDay(int day) {
   pref_service_->SetInteger(type_info_.day_pref, day);
 }
 
 bool RequestThrottler::HasDay() const {
   return pref_service_->HasPrefPath(type_info_.day_pref);
 }
 
 }  // namespace ntp_snippets