Implement disabled list

components/offline_pages/background/request_picker.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/offline_pages/background/request_picker.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "components/offline_pages/background/save_page_request.h"
 
@@ skipping 19 matching lines @@
       fewer_retries_better_(false),
       earlier_requests_better_(false),
       weak_ptr_factory_(this) {}
 
 RequestPicker::~RequestPicker() {}
 
 // Entry point for the async operation to choose the next request.
 void RequestPicker::ChooseNextRequest(
     RequestCoordinator::RequestPickedCallback picked_callback,
     RequestCoordinator::RequestNotPickedCallback not_picked_callback,
-    DeviceConditions* device_conditions) {
+    DeviceConditions* device_conditions,
+    const std::set<int64_t>& disabled_requests) {
   picked_callback_ = picked_callback;
   not_picked_callback_ = not_picked_callback;
   fewer_retries_better_ = policy_->ShouldPreferUntriedRequests();
   earlier_requests_better_ = policy_->ShouldPreferEarlierRequests();
   current_conditions_.reset(new DeviceConditions(*device_conditions));
   // Get all requests from queue (there is no filtering mechanism).
   queue_->GetRequests(base::Bind(&RequestPicker::GetRequestResultCallback,
-                                 weak_ptr_factory_.GetWeakPtr()));
+                                 weak_ptr_factory_.GetWeakPtr(),
+                                 disabled_requests));
 }
 
 // When we get contents from the queue, use them to pick the next
 // request to operate on (if any).
 void RequestPicker::GetRequestResultCallback(
+    const std::set<int64_t>& disabled_requests,
     RequestQueue::GetRequestsResult,
     std::vector<std::unique_ptr<SavePageRequest>> requests) {
   // If there is nothing to do, return right away.
   if (requests.size() == 0) {
     not_picked_callback_.Run(false);
     return;
   }
 
   // Get the expired requests to be removed from the queue, and the valid ones
   // from which to pick the next request.
@@ skipping 15 matching lines @@
 
   // Choose which comparison function to use based on policy.
   if (policy_->RetryCountIsMoreImportantThanRecency())
     comparator = &RequestPicker::RetryCountFirstCompareFunction;
   else
     comparator = &RequestPicker::RecencyFirstCompareFunction;
 
   // Iterate once through the requests, keeping track of best candidate.
   bool non_user_requested_tasks_remaining = false;
   for (unsigned i = 0; i < valid_requests.size(); ++i) {
+    // If the  request is on the disabled list, skip it.
+    auto search = disabled_requests.find(valid_requests[i]->request_id());
+    if (search != disabled_requests.end()) {
+      continue;
+    }
     if (!valid_requests[i]->user_requested())
       non_user_requested_tasks_remaining = true;
     if (!RequestConditionsSatisfied(valid_requests[i].get()))
       continue;
     if (IsNewRequestBetter(picked_request, valid_requests[i].get(), comparator))
       picked_request = valid_requests[i].get();
   }
 
   // If we have a best request to try next, get the request coodinator to
   // start it.  Otherwise return that we have no candidates.
@@ skipping 160 matching lines @@
   const RequestCoordinator::BackgroundSavePageResult save_page_result(
       RequestCoordinator::BackgroundSavePageResult::EXPIRED);
   for (const auto& request : result->updated_items) {
     event_logger_->RecordDroppedSavePageRequest(
         request.client_id().name_space, save_page_result, request.request_id());
     notifier_->NotifyCompleted(request, save_page_result);
   }
 }
 
 }  // namespace offline_pages