Add request throttler to thumbnail fetching for articles on mobile NTP

components/ntp_snippets/request_throttler.h

 // 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.
 
 #ifndef COMPONENTS_NTP_SNIPPETS_REQUEST_THROTTLER_H_
 #define COMPONENTS_NTP_SNIPPETS_REQUEST_THROTTLER_H_
 
+#include <limits.h>

[Marc Treib, 2016/08/09 14:04:53]

Move to the .cc

[jkrcal, 2016/08/10 10:27:26]

Done.

 #include <string>
 
 #include "base/macros.h"
 
 class PrefRegistrySimple;
 class PrefService;
 
 namespace base {
 class HistogramBase;
 }  // namespace base
@@ skipping 15 matching lines @@
 // Implementation notes: When extending this class for a new RequestType, please
 //  1) define in request_counter.cc in kRequestTypeInfo
 //     a) the string value for your |type| and
 //     b) constants for day/count prefs;
 //  2) define a new RequestThrottlerTypes histogram suffix in histogram.xml
 //     (with the same string value as in 1a)).
 class RequestThrottler {
  public:
   // Enumeration listing all current applications of the request counter.
   enum class RequestType {
-    CONTENT_SUGGESTION_FETCHER
+    CONTENT_SUGGESTION_FETCHER,
+    CONTENT_SUGGESTION_THUMBNAIL,
   };
 
   RequestThrottler(PrefService* pref_service, RequestType type);
 
   // Registers profile prefs for all RequestTypes. Called from browser_prefs.cc.
   static void RegisterProfilePrefs(PrefRegistrySimple* registry);
 
   // Returns whether quota is available for another request and reports this
-  // information to UMA. Forced requests always return true -- should be only
-  // used for requests initiated by the user (if it is safe to assume that all
-  // users cannot generate an amount of requests we cannot handle).
-  bool DemandQuotaForRequest(bool force_request);
+  // information to UMA. Interactive requests should be always granted (upon
+  // standard conditions) and should be only used for requests initiated by the
+  // user (if it is safe to assume that all users cannot generate an amount of
+  // requests we cannot handle).
+  bool DemandQuotaForRequest(bool interactive_request);
 
  private:
   friend class RequestThrottlerTest;
   // Used internally for working with a RequestType.
   struct RequestTypeInfo;
 
   // The array of info entries - one per each RequestType.
   static const RequestTypeInfo kRequestTypeInfo[];
 
   // Also emits the PerDay histogram if the day changed.
   void ResetCounterIfDayChanged();
 
   const char* GetRequestTypeAsString() const;
 
-  int GetCount() const;
-  void SetCount(int count);
+  int GetQuota(bool interactive_request) const;
+  int GetCount(bool interactive_request) const;
+  void SetCount(bool interactive_request, int count);
   int GetDay() const;
   void SetDay(int day);
   bool HasDay() const;
 
   PrefService* pref_service_;
   const RequestTypeInfo& type_info_;
 
-  // It comes from a variation parameter or |default_quota| as a fallback.
+  // The quotas come from variation parameters or default quotas as a fallback.

[Marc Treib, 2016/08/09 14:04:53]

I'd formulate this the other way around: The quotas are hardcoded, but can be
overridden by variation params.

[jkrcal, 2016/08/10 10:27:26]

Done.

   int quota_;
+  int interactive_quota_;
 
   // The histograms for reporting the requests of the given |type_|.
   base::HistogramBase* histogram_request_status_;
   base::HistogramBase* histogram_per_day_;
 
   DISALLOW_COPY_AND_ASSIGN(RequestThrottler);
 };
 
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_REQUEST_THROTTLER_H_