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 b9c710c2e66e6f1245a12712b236b8e1d68dec7c..dd2373bf8ce7fb5dcf217ca3a1a8ebcf344797f0 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_builder.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"
@@ -260,11 +261,11 @@ class RequestCoordinatorTest
   }
 
   // Callback for Add requests.
-  void AddRequestDone(RequestQueue::AddRequestResult result,
+  void AddRequestDone(QueueResults::AddRequestResult result,
                       const SavePageRequest& request);
 
   // Callback for getting requests.
-  void GetRequestsDone(RequestQueue::GetRequestsResult result,
+  void GetRequestsDone(QueueResults::GetRequestsResult result,
                        std::vector<std::unique_ptr<SavePageRequest>> requests);
 
   // Callback for removing requests.
@@ -280,7 +281,7 @@ class RequestCoordinatorTest
   void SendOfflinerDoneCallback(const SavePageRequest& request,
                                 Offliner::RequestStatus status);
 
-  RequestQueue::GetRequestsResult last_get_requests_result() const {
+  QueueResults::GetRequestsResult last_get_requests_result() const {
     return last_get_requests_result_;
   }
 
@@ -359,7 +360,7 @@ class RequestCoordinatorTest
   }
 
  private:
-  RequestQueue::GetRequestsResult last_get_requests_result_;
+  QueueResults::GetRequestsResult last_get_requests_result_;
   MultipleItemStatuses last_remove_results_;
   std::vector<std::unique_ptr<SavePageRequest>> last_requests_;
   scoped_refptr<base::TestMockTimeTaskRunner> task_runner_;
@@ -373,7 +374,7 @@ class RequestCoordinatorTest
 };
 
 RequestCoordinatorTest::RequestCoordinatorTest()
-    : last_get_requests_result_(RequestQueue::GetRequestsResult::STORE_FAILURE),
+    : last_get_requests_result_(QueueResults::GetRequestsResult::STORE_FAILURE),
       task_runner_(new base::TestMockTimeTaskRunner),
       task_runner_handle_(task_runner_),
       offliner_(nullptr),
@@ -398,6 +399,10 @@ void RequestCoordinatorTest::SetUp() {
       std::move(policy), std::move(factory), std::move(queue),
       std::move(scheduler_stub), network_quality_estimator_.get()));
   coordinator_->AddObserver(&observer_);
+  PickRequestTaskBuilder* builder = new PickRequestTaskBuilder(
+      coordinator_->policy(), static_cast<RequestNotifier*>(coordinator_.get()),
+      coordinator_->GetLogger());
+  coordinator_->queue()->SetPickerBuilder(builder);
   SetEffectiveConnectionTypeForTest(
       net::EffectiveConnectionType::EFFECTIVE_CONNECTION_TYPE_OFFLINE);
   SetNetworkConditionsForTest(
@@ -409,7 +414,7 @@ void RequestCoordinatorTest::PumpLoop() {
 }
 
 void RequestCoordinatorTest::GetRequestsDone(
-    RequestQueue::GetRequestsResult result,
+    QueueResults::GetRequestsResult result,
     std::vector<std::unique_ptr<SavePageRequest>> requests) {
   last_get_requests_result_ = result;
   last_requests_ = std::move(requests);
@@ -428,7 +433,7 @@ void RequestCoordinatorTest::GetQueuedRequestsDone(
 }
 
 void RequestCoordinatorTest::AddRequestDone(
-    RequestQueue::AddRequestResult result,
+    QueueResults::AddRequestResult result,
     const SavePageRequest& request) {}
 
 void RequestCoordinatorTest::SetupForOfflinerDoneCallbackTest(