[Offline Pages] Remove expired requests from the queue.

components/offline_pages/background/request_picker.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_OFFLINE_PAGES_BACKGROUND_REQUEST_PICKER_H_
 #define COMPONENTS_OFFLINE_PAGES_BACKGROUND_REQUEST_PICKER_H_
 
 #include <memory>
 
 #include "base/memory/weak_ptr.h"
 #include "components/offline_pages/background/device_conditions.h"
 #include "components/offline_pages/background/offliner_policy.h"
 #include "components/offline_pages/background/request_coordinator.h"
 #include "components/offline_pages/background/request_queue.h"
 
 namespace offline_pages {
 
 typedef bool (RequestPicker::*RequestCompareFunction)(
     const SavePageRequest* left, const SavePageRequest* right);
 
 class RequestPicker {
  public:
-  RequestPicker(RequestQueue* requestQueue, OfflinerPolicy* policy);
+  RequestPicker(RequestQueue* requestQueue,
+                OfflinerPolicy* policy,
+                RequestCoordinator* coordinator);

[Pete Williamson, 2016/08/16 23:40:46]

This builds a circular dependency - RP depends on RC, RC depends on RC.  To
break the dependency, we should have a new interface that both depend on, and
pass the interface down to RP.  It's OK to just add a TODO for now and do it in
a future change.

[romax, 2016/08/17 20:07:59]

Done.

 
   ~RequestPicker();
 
   // Choose which request we should process next based on the current
   // conditions, and call back to the RequestCoordinator when we have one.
   void ChooseNextRequest(
       RequestCoordinator::RequestPickedCallback picked_callback,
       RequestCoordinator::RequestQueueEmptyCallback empty_callback,
       DeviceConditions* device_conditions);
 
@@ skipping 22 matching lines @@
                                    const SavePageRequest* right);
 
   // Does the new request have better retry count?
   int CompareRetryCount(const SavePageRequest* left,
                         const SavePageRequest* right);
 
   // Does the new request have better creation time?
   int CompareCreationTime(const SavePageRequest* left,
                           const SavePageRequest* right);
 
-  // unowned pointer to the request queue.
+  // Split all requests into expired ones and still valid ones.
+  void SplitRequests(const std::vector<SavePageRequest>& requests,
+                     std::vector<SavePageRequest>& valid_requests,
+                     std::vector<SavePageRequest>& expired_requests);
+
+  // Callback used after requests get expired.
+  void OnRequestExpired(
+      const RequestQueue::UpdateMultipleRequestResults& results,
+      const std::vector<SavePageRequest>& requests);
+
+  // Unowned pointer to the request queue.
   RequestQueue* queue_;
-  // unowned pointer to the policy object.
+  // Unowned pointer to the policy object.
   OfflinerPolicy* policy_;
+  // Unowned pointer to the request coordinator.
+  RequestCoordinator* coordinator_;
   // Current conditions on the device
   std::unique_ptr<DeviceConditions> current_conditions_;
   // True if we prefer less-tried requests
   bool fewer_retries_better_;
   // True if we prefer requests submitted more recently
   bool earlier_requests_better_;
   // Callback for when we are done picking a request to do next.
   RequestCoordinator::RequestPickedCallback picked_callback_;
   // Callback for when there are no more reqeusts to pick.
   RequestCoordinator::RequestQueueEmptyCallback empty_callback_;
   // Allows us to pass a weak pointer to callbacks.
   base::WeakPtrFactory<RequestPicker> weak_ptr_factory_;
 };
 
 }  // namespace offline_pages
 
 #endif  // COMPONENTS_OFFLINE_PAGES_BACKGROUND_REQUEST_PICKER_H_