[Remote suggestions] Move the throttler into the Scheduler

components/ntp_snippets/remote/remote_suggestions_fetcher.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/remote_suggestions_fetcher.h"
 
 #include <cstdlib>
 #include <utility>
 
 #include "base/files/file_path.h"
@@ skipping 43 matching lines @@
 
 // Variation parameter for chrome-content-suggestions backend.
 const char kContentSuggestionsBackend[] = "content_suggestions_backend";
 
 const int kFetchTimeHistogramResolution = 5;
 
 std::string FetchResultToString(FetchResult result) {
   switch (result) {
     case FetchResult::SUCCESS:
       return "OK";
     case FetchResult::DEPRECATED_EMPTY_HOSTS:

[Marc Treib, 2017/02/24 15:50:35]

Could you move this into the "invalid" section too?

[jkrcal, 2017/02/27 10:26:23]

Done.

       return "Cannot fetch for empty hosts list.";
     case FetchResult::URL_REQUEST_STATUS_ERROR:
       return "URLRequestStatus error";
     case FetchResult::HTTP_ERROR:
       return "HTTP error";
     case FetchResult::JSON_PARSE_ERROR:
       return "Received invalid JSON";
     case FetchResult::INVALID_SNIPPET_CONTENT_ERROR:
       return "Invalid / empty list.";
     case FetchResult::OAUTH_TOKEN_ERROR:
       return "Error in obtaining an OAuth2 access token.";
-    case FetchResult::INTERACTIVE_QUOTA_ERROR:
-      return "Out of interactive quota.";
-    case FetchResult::NON_INTERACTIVE_QUOTA_ERROR:
-      return "Out of non-interactive quota.";
+    // Enum elements that do not represent any valid fetch result.
+    case FetchResult::INTERACTIVE_QUOTA_ERROR_OBSOLETE:
+    case FetchResult::NON_INTERACTIVE_QUOTA_ERROR_OBSOLETE:
     case FetchResult::RESULT_MAX:
       break;
   }
   NOTREACHED();
   return "Unknown error";
 }
 
 Status FetchResultToStatus(FetchResult result) {
   switch (result) {
     case FetchResult::SUCCESS:
       return Status::Success();
     // Permanent errors occur if it is more likely that the error originated
     // from the client.
     case FetchResult::DEPRECATED_EMPTY_HOSTS:

[Marc Treib, 2017/02/24 15:50:35]

Also here

[jkrcal, 2017/02/27 10:26:23]

Done.

     case FetchResult::OAUTH_TOKEN_ERROR:
       return Status(StatusCode::PERMANENT_ERROR, FetchResultToString(result));
     // Temporary errors occur if it's more likely that the client behaved
     // correctly but the server failed to respond as expected.
     // TODO(fhorschig): Revisit HTTP_ERROR once the rescheduling was reworked.
     case FetchResult::HTTP_ERROR:
-    case FetchResult::INTERACTIVE_QUOTA_ERROR:
-    case FetchResult::NON_INTERACTIVE_QUOTA_ERROR:
     case FetchResult::URL_REQUEST_STATUS_ERROR:
     case FetchResult::INVALID_SNIPPET_CONTENT_ERROR:
     case FetchResult::JSON_PARSE_ERROR:
       return Status(StatusCode::TEMPORARY_ERROR, FetchResultToString(result));
+    // Enum elements that do not represent any valid fetch result.
+    case FetchResult::INTERACTIVE_QUOTA_ERROR_OBSOLETE:
+    case FetchResult::NON_INTERACTIVE_QUOTA_ERROR_OBSOLETE:
     case FetchResult::RESULT_MAX:
       break;
   }
   NOTREACHED();
   return Status(StatusCode::PERMANENT_ERROR, std::string());
 }
 
 std::string GetFetchEndpoint() {
   std::string endpoint = variations::GetVariationParamValueByFeature(
       ntp_snippets::kArticleSuggestionsFeature, kContentSuggestionsBackend);
@@ skipping 137 matching lines @@
       token_service_(token_service),
       url_request_context_getter_(std::move(url_request_context_getter)),
       language_model_(language_model),
       parse_json_callback_(parse_json_callback),
       fetch_url_(GetFetchEndpoint()),
       fetch_api_(UsesChromeContentSuggestionsAPI(fetch_url_)
                      ? FetchAPI::CHROME_CONTENT_SUGGESTIONS_API
                      : FetchAPI::CHROME_READER_API),
       api_key_(api_key),
       clock_(new base::DefaultClock()),
-      user_classifier_(user_classifier),
-      request_throttler_rare_ntp_user_(
-          pref_service,
-          RequestThrottler::RequestType::
-              CONTENT_SUGGESTION_FETCHER_RARE_NTP_USER),
-      request_throttler_active_ntp_user_(
-          pref_service,
-          RequestThrottler::RequestType::
-              CONTENT_SUGGESTION_FETCHER_ACTIVE_NTP_USER),
-      request_throttler_active_suggestions_consumer_(
-          pref_service,
-          RequestThrottler::RequestType::
-              CONTENT_SUGGESTION_FETCHER_ACTIVE_SUGGESTIONS_CONSUMER) {}
+      user_classifier_(user_classifier) {}
 
 RemoteSuggestionsFetcher::~RemoteSuggestionsFetcher() {
   if (waiting_for_refresh_token_) {
     token_service_->RemoveObserver(this);
   }
 }
 
 void RemoteSuggestionsFetcher::FetchSnippets(
     const RequestParams& params,
     SnippetsAvailableCallback callback) {
-  if (!DemandQuotaForRequest(params.interactive_request)) {
-    FetchFinished(OptionalFetchedCategories(), std::move(callback),
-                  params.interactive_request
-                      ? FetchResult::INTERACTIVE_QUOTA_ERROR
-                      : FetchResult::NON_INTERACTIVE_QUOTA_ERROR,
-                  /*error_details=*/std::string());
-    return;
-  }
-
   if (!params.interactive_request) {
     UMA_HISTOGRAM_SPARSE_SLOWLY(
         "NewTabPage.Snippets.FetchTimeLocal",
         GetMinuteOfTheDay(/*local_time=*/true,
                           /*reduced_resolution=*/true, clock_.get()));
     UMA_HISTOGRAM_SPARSE_SLOWLY(
         "NewTabPage.Snippets.FetchTimeUTC",
         GetMinuteOfTheDay(/*local_time=*/false,
                           /*reduced_resolution=*/true, clock_.get()));
   }
@@ skipping 259 matching lines @@
         }
         categories->back().suggestions = std::move(suggestions);
       }
       return true;
     }
   }
   NOTREACHED();
   return false;
 }
 
-bool RemoteSuggestionsFetcher::DemandQuotaForRequest(bool interactive_request) {
-  switch (user_classifier_->GetUserClass()) {
-    case UserClassifier::UserClass::RARE_NTP_USER:
-      return request_throttler_rare_ntp_user_.DemandQuotaForRequest(
-          interactive_request);
-    case UserClassifier::UserClass::ACTIVE_NTP_USER:
-      return request_throttler_active_ntp_user_.DemandQuotaForRequest(
-          interactive_request);
-    case UserClassifier::UserClass::ACTIVE_SUGGESTIONS_CONSUMER:
-      return request_throttler_active_suggestions_consumer_
-          .DemandQuotaForRequest(interactive_request);
-  }
-  NOTREACHED();
-  return false;
-}
-
 }  // namespace ntp_snippets