Split the RequestPicker task into two separate tasks.

components/offline_pages/background/request_queue.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_queue.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/offline_pages/background/add_request_task.h"
 #include "components/offline_pages/background/change_requests_state_task.h"
 #include "components/offline_pages/background/get_requests_task.h"
 #include "components/offline_pages/background/initialize_store_task.h"
 #include "components/offline_pages/background/mark_attempt_aborted_task.h"
 #include "components/offline_pages/background/mark_attempt_completed_task.h"
 #include "components/offline_pages/background/mark_attempt_started_task.h"
 #include "components/offline_pages/background/pick_request_task.h"
-#include "components/offline_pages/background/pick_request_task_factory.h"
 #include "components/offline_pages/background/remove_requests_task.h"
 #include "components/offline_pages/background/request_queue_store.h"
 #include "components/offline_pages/background/save_page_request.h"
 
 namespace offline_pages {
 
 namespace {
 // Completes the get requests call.
 void GetRequestsDone(const RequestQueue::GetRequestsCallback& callback,
                      bool success,
@@ skipping 85 matching lines @@
 }
 
 void RequestQueue::MarkAttemptCompleted(int64_t request_id,
                                         const UpdateCallback& callback) {
   std::unique_ptr<Task> task(
       new MarkAttemptCompletedTask(store_.get(), request_id, callback));
   task_queue_.AddTask(std::move(task));
 }
 
 void RequestQueue::PickNextRequest(
+    OfflinerPolicy* policy,
     PickRequestTask::RequestPickedCallback picked_callback,
     PickRequestTask::RequestNotPickedCallback not_picked_callback,
     PickRequestTask::RequestCountCallback request_count_callback,
     DeviceConditions& conditions,
     std::set<int64_t>& disabled_requests) {
   // Using the PickerContext, create a picker task.
-  std::unique_ptr<Task> task(picker_factory_->CreatePickerTask(
-      store_.get(), picked_callback, not_picked_callback,
+  std::unique_ptr<Task> task(new PickRequestTask(
+      store_.get(), policy, picked_callback, not_picked_callback,
       request_count_callback, conditions, disabled_requests));
 
   // Queue up the picking task, it will call one of the callbacks when it
   // completes.
   task_queue_.AddTask(std::move(task));
 }
 
+void RequestQueue::CleanupRequestQueue() {
+  // Create a cleanup task.
+  std::unique_ptr<Task> task(cleanup_factory_->CreateCleanupTask(store_.get()));
+
+  // Queue up the cleanup task.
+  task_queue_.AddTask(std::move(task));
+}
+
 void RequestQueue::Initialize() {
   std::unique_ptr<Task> task(new InitializeStoreTask(
       store_.get(), base::Bind(&RequestQueue::InitializeStoreDone,
                                weak_ptr_factory_.GetWeakPtr())));
   task_queue_.AddTask(std::move(task));
 }
 
 void RequestQueue::InitializeStoreDone(bool success) {
   // TODO(fgorski): Result can be ignored for now. Report UMA in future.
   // No need to pass the result up to RequestCoordinator.
 }
 
 }  // namespace offline_pages