Request Picker task

components/offline_pages/background/request_coordinator.h

Index: components/offline_pages/background/request_coordinator.h
diff --git a/components/offline_pages/background/request_coordinator.h b/components/offline_pages/background/request_coordinator.h
index a39411d29826b9b41cd7decd42b74a46df18f5b7..1a33d9acaf6f1c8f331a109e4cc047901f7de5e2 100644
--- a/components/offline_pages/background/request_coordinator.h
+++ b/components/offline_pages/background/request_coordinator.h
@@ -63,13 +63,6 @@ class RequestCoordinator : public KeyedService,
     DISABLED_FOR_OFFLINER,
   };
 
-  // Callback to report when a request was available.
-  typedef base::Callback<void(const SavePageRequest& request)>
-      RequestPickedCallback;
-
-  // Callback to report when no request was available.
-  typedef base::Callback<void(bool)> RequestNotPickedCallback;
-
   // Callback specifying which request IDs were actually removed.
   typedef base::Callback<void(const MultipleItemStatuses&)>
       RemoveRequestsCallback;
@@ -192,9 +185,7 @@ class RequestCoordinator : public KeyedService,
     return processing_state_ == ProcessingWindowState::STOPPED;
   }
 
-  OfflineEventLogger* GetLogger() {
-    return &event_logger_;
-  }
+  RequestCoordinatorEventLogger* GetLogger() { return &event_logger_; }
 
  private:
   // Immediate start attempt status code for UMA.
@@ -229,37 +220,38 @@ class RequestCoordinator : public KeyedService,
   // SavePageRequest objects for the caller of GetQueuedRequests.
   void GetQueuedRequestsCallback(
       const GetRequestsCallback& callback,
-      RequestQueue::GetRequestsResult result,
+      QueueResults::GetRequestsResult result,
       std::vector<std::unique_ptr<SavePageRequest>> requests);
 
   // Receives the results of a get from the request queue, and turns that into
   // SavePageRequest objects for the caller of GetQueuedRequests.
   void GetRequestsForSchedulingCallback(
-      RequestQueue::GetRequestsResult result,
+      QueueResults::GetRequestsResult result,
       std::vector<std::unique_ptr<SavePageRequest>> requests);
 
   // Receives the result of add requests to the request queue.
-  void AddRequestResultCallback(RequestQueue::AddRequestResult result,
+  void AddRequestResultCallback(QueueResults::AddRequestResult result,
                                 const SavePageRequest& request);
 
   // Receives the result of mark attempt completed requests.
   void MarkAttemptCompletedDoneCallback(
       int64_t request_id,
       const ClientId& client_id,
-      std::unique_ptr<UpdateRequestsResult> result);
+      std::unique_ptr<QueueResults::UpdateRequestsResult> result);
 
   void UpdateMultipleRequestsCallback(
-      std::unique_ptr<UpdateRequestsResult> result);
+      std::unique_ptr<QueueResults::UpdateRequestsResult> result);
 
   void CompletedRequestCallback(const MultipleItemStatuses& status);
 
   void HandleRemovedRequestsAndCallback(
       const RemoveRequestsCallback& callback,
-      BackgroundSavePageResult status,
-      std::unique_ptr<UpdateRequestsResult> result);
+      RequestNotifier::BackgroundSavePageResult status,
+      std::unique_ptr<QueueResults::UpdateRequestsResult> result);
 
-  void HandleRemovedRequests(BackgroundSavePageResult status,
-                             std::unique_ptr<UpdateRequestsResult> result);
+  void HandleRemovedRequests(
+      RequestNotifier::BackgroundSavePageResult status,
+      std::unique_ptr<QueueResults::UpdateRequestsResult> result);
 
   bool StartProcessingInternal(const ProcessingWindowState processing_state,
                                const DeviceConditions& device_conditions,
@@ -293,9 +285,10 @@ class RequestCoordinator : public KeyedService,
 
   // Continuation of |SendRequestToOffliner| after the request is marked as
   // started.
-  void StartOffliner(int64_t request_id,
-                     const std::string& client_namespace,
-                     std::unique_ptr<UpdateRequestsResult> update_result);
+  void StartOffliner(
+      int64_t request_id,
+      const std::string& client_namespace,
+      std::unique_ptr<QueueResults::UpdateRequestsResult> update_result);
 
   // Called by the offliner when an offlining request is completed. (and by
   // tests).
@@ -317,9 +310,10 @@ class RequestCoordinator : public KeyedService,
                               BackgroundSavePageResult status);
 
   // Completes aborting the request, reports an error if it fails.
-  void MarkAttemptAbortedDone(int64_t request_id,
-                              const ClientId& client_id,
-                              std::unique_ptr<UpdateRequestsResult> result);
+  void MarkAttemptAbortedDone(
+      int64_t request_id,
+      const ClientId& client_id,
+      std::unique_ptr<QueueResults::UpdateRequestsResult> result);
 
   // Returns the appropriate offliner to use, getting a new one from the factory
   // if needed.
@@ -384,8 +378,6 @@ class RequestCoordinator : public KeyedService,
   std::unique_ptr<SavePageRequest> active_request_;
   // Status of the most recent offlining.
   Offliner::RequestStatus last_offlining_status_;
-  // Class to choose which request to schedule next
-  std::unique_ptr<RequestPicker> picker_;
   // A set of request_ids that we are holding off until the download manager is
   // done with them.
   std::set<int64_t> disabled_requests_;