Request Picker task

components/offline_pages/background/request_coordinator_unittest.cc

Index: components/offline_pages/background/request_coordinator_unittest.cc
diff --git a/components/offline_pages/background/request_coordinator_unittest.cc b/components/offline_pages/background/request_coordinator_unittest.cc
index af0ad232e6c97d91e9f16297d243a5072ac2581a..51f5482fc4707d7f6f55c4eadd352aca6e636bf4 100644
--- a/components/offline_pages/background/request_coordinator_unittest.cc
+++ b/components/offline_pages/background/request_coordinator_unittest.cc
@@ -21,6 +21,7 @@
 #include "components/offline_pages/background/offliner.h"
 #include "components/offline_pages/background/offliner_factory.h"
 #include "components/offline_pages/background/offliner_policy.h"
+#include "components/offline_pages/background/pick_request_task_factory.h"
 #include "components/offline_pages/background/request_queue.h"
 #include "components/offline_pages/background/request_queue_in_memory_store.h"
 #include "components/offline_pages/background/save_page_request.h"
@@ -261,11 +262,10 @@ class RequestCoordinatorTest
   }
 
   // Callback for Add requests.
-  void AddRequestDone(RequestQueue::AddRequestResult result,
-                      const SavePageRequest& request);
+  void AddRequestDone(AddRequestResult result, const SavePageRequest& request);
 
   // Callback for getting requests.
-  void GetRequestsDone(RequestQueue::GetRequestsResult result,
+  void GetRequestsDone(GetRequestsResult result,
                        std::vector<std::unique_ptr<SavePageRequest>> requests);
 
   // Callback for removing requests.
@@ -281,7 +281,7 @@ class RequestCoordinatorTest
   void SendOfflinerDoneCallback(const SavePageRequest& request,
                                 Offliner::RequestStatus status);
 
-  RequestQueue::GetRequestsResult last_get_requests_result() const {
+  GetRequestsResult last_get_requests_result() const {
     return last_get_requests_result_;
   }
 
@@ -374,7 +374,7 @@ class RequestCoordinatorTest
   }
 
  private:
-  RequestQueue::GetRequestsResult last_get_requests_result_;
+  GetRequestsResult last_get_requests_result_;
   MultipleItemStatuses last_remove_results_;
   std::vector<std::unique_ptr<SavePageRequest>> last_requests_;
   scoped_refptr<base::TestMockTimeTaskRunner> task_runner_;
@@ -388,7 +388,7 @@ class RequestCoordinatorTest
 };
 
 RequestCoordinatorTest::RequestCoordinatorTest()
-    : last_get_requests_result_(RequestQueue::GetRequestsResult::STORE_FAILURE),
+    : last_get_requests_result_(GetRequestsResult::STORE_FAILURE),
       task_runner_(new base::TestMockTimeTaskRunner),
       task_runner_handle_(task_runner_),
       offliner_(nullptr),
@@ -400,20 +400,26 @@ RequestCoordinatorTest::~RequestCoordinatorTest() {}
 
 void RequestCoordinatorTest::SetUp() {
   std::unique_ptr<OfflinerPolicy> policy(new OfflinerPolicy());
-  std::unique_ptr<OfflinerFactory> factory(new OfflinerFactoryStub());
+  std::unique_ptr<OfflinerFactory> offliner_factory(new OfflinerFactoryStub());
   // Save the offliner for use by the tests.
-  offliner_ =
-      reinterpret_cast<OfflinerStub*>(factory->GetOffliner(policy.get()));
+  offliner_ = reinterpret_cast<OfflinerStub*>(
+      offliner_factory->GetOffliner(policy.get()));
   std::unique_ptr<RequestQueueInMemoryStore>
       store(new RequestQueueInMemoryStore());
   std::unique_ptr<RequestQueue> queue(new RequestQueue(std::move(store)));
   std::unique_ptr<Scheduler> scheduler_stub(new SchedulerStub());
   network_quality_estimator_.reset(new NetworkQualityEstimatorStub());
   coordinator_.reset(new RequestCoordinator(
-      std::move(policy), std::move(factory), std::move(queue),
+      std::move(policy), std::move(offliner_factory), std::move(queue),
       std::move(scheduler_stub), network_quality_estimator_.get()));
   coordinator_->AddObserver(&observer_);
   SetNetworkConnected(true);
+  std::unique_ptr<PickRequestTaskFactory> picker_factory(
+      new PickRequestTaskFactory(
+          coordinator_->policy(),
+          static_cast<RequestNotifier*>(coordinator_.get()),
+          coordinator_->GetLogger()));
+  coordinator_->queue()->SetPickerFactory(std::move(picker_factory));
 }
 
 void RequestCoordinatorTest::PumpLoop() {
@@ -421,7 +427,7 @@ void RequestCoordinatorTest::PumpLoop() {
 }
 
 void RequestCoordinatorTest::GetRequestsDone(
-    RequestQueue::GetRequestsResult result,
+    GetRequestsResult result,
     std::vector<std::unique_ptr<SavePageRequest>> requests) {
   last_get_requests_result_ = result;
   last_requests_ = std::move(requests);
@@ -439,9 +445,8 @@ void RequestCoordinatorTest::GetQueuedRequestsDone(
   waiter_.Signal();
 }
 
-void RequestCoordinatorTest::AddRequestDone(
-    RequestQueue::AddRequestResult result,
-    const SavePageRequest& request) {}
+void RequestCoordinatorTest::AddRequestDone(AddRequestResult result,
+                                            const SavePageRequest& request) {}
 
 void RequestCoordinatorTest::SetupForOfflinerDoneCallbackTest(
     offline_pages::SavePageRequest* request) {