Split the RequestPicker task into two separate tasks.

components/offline_pages/background/request_queue_unittest.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 <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 517 matching lines @@
   ASSERT_TRUE(update_requests_result());
   EXPECT_EQ(1UL, update_requests_result()->item_statuses.size());
   EXPECT_EQ(kRequestId, update_requests_result()->item_statuses.at(0).first);
   EXPECT_EQ(ItemActionStatus::SUCCESS,
             update_requests_result()->item_statuses.at(0).second);
   EXPECT_EQ(1UL, update_requests_result()->updated_items.size());
   EXPECT_EQ(SavePageRequest::RequestState::AVAILABLE,
             update_requests_result()->updated_items.at(0).request_state());
 }
 
-// Request expiration is detected during the call to pick a request, which
-// is why this test calls PickNextRequest().
 TEST_F(RequestQueueTest, CleanStaleRequests) {
   // Create a request that is already expired.
   base::Time creation_time =
       base::Time::Now() - base::TimeDelta::FromSeconds(2 * kOneWeekInSeconds);
 
   SavePageRequest original_request(kRequestId, kUrl, kClientId, creation_time,
                                    kUserRequested);
   queue()->AddRequest(
       original_request,
       base::Bind(&RequestQueueTest::AddRequestDone, base::Unretained(this)));
   this->PumpLoop();
   this->ClearResults();
 
   // Set up a picker factory pointing to our fake notifier.
   OfflinerPolicy policy;
   RequestNotifierStub notifier;
   RequestCoordinatorEventLogger event_logger;
-  std::unique_ptr<PickRequestTaskFactory> picker_factory(
-      new PickRequestTaskFactory(&policy, &notifier, &event_logger));
-  queue()->SetPickerFactory(std::move(picker_factory));
+  std::unique_ptr<CleanupTaskFactory> cleanup_factory(
+      new CleanupTaskFactory(&policy, &notifier, &event_logger));
+  queue()->SetCleanupFactory(std::move(cleanup_factory));
 
   // Do a pick and clean operation, which will remove stale entries.
   DeviceConditions conditions;
   std::set<int64_t> disabled_list;
-  queue()->PickNextRequest(
-      base::Bind(&RequestQueueTest::RequestPickedCallback,
-                 base::Unretained(this)),
-      base::Bind(&RequestQueueTest::RequestNotPickedCallback,
-                 base::Unretained(this)),
-      base::Bind(&RequestQueueTest::RequestCountCallback,
-                 base::Unretained(this)),
-      conditions, disabled_list);
+  queue()->CleanupRequestQueue();
 
   this->PumpLoop();
 
   // Notifier should have been notified that the request was removed.
   ASSERT_EQ(notifier.last_expired_request().request_id(), kRequestId);
   ASSERT_EQ(notifier.last_request_expiration_status(),
             RequestNotifier::BackgroundSavePageResult::EXPIRED);
 
   // Doing a get should show no entries left in the queue since the expired
   // request has been removed.
   queue()->GetRequests(
       base::Bind(&RequestQueueTest::GetRequestsDone, base::Unretained(this)));
   this->PumpLoop();
   ASSERT_EQ(GetRequestsResult::SUCCESS, this->last_get_requests_result());
   ASSERT_TRUE(this->last_requests().empty());
 }
 
 }  // namespace offline_pages