Split the RequestPicker task into two separate tasks.

components/offline_pages/background/request_coordinator.h

 // 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.
 
 #ifndef COMPONENTS_OFFLINE_PAGES_BACKGROUND_REQUEST_COORDINATOR_H_
 #define COMPONENTS_OFFLINE_PAGES_BACKGROUND_REQUEST_COORDINATOR_H_
 
 #include <memory>
 #include <set>
 #include <string>
@@ skipping 242 matching lines @@
   // as to other device conditions).
   void StartImmediatelyIfConnected();
 
   OfflinerImmediateStartStatus TryImmediateStart();
 
   // Check the request queue, and schedule a task corresponding
   // to the least restrictive type of request in the queue.
   void ScheduleAsNeeded();
 
   // Callback from the request picker when it has chosen our next request.
-  void RequestPicked(const SavePageRequest& request);
+  void RequestPicked(const SavePageRequest& request, const bool cleanup_needed);
 
   // Callback from the request picker when no more requests are in the queue.
   // The parameter is a signal for what (if any) conditions to schedule future
   // processing for.
-  void RequestNotPicked(bool non_user_requested_tasks_remaining);
+  void RequestNotPicked(const bool non_user_requested_tasks_remaining,

[fgorski, 2016/12/02 21:44:04]

I don't think you need to define "const bool" here, just "bool". (primitive
type)

Applies above and below.

[Pete Williamson, 2016/12/05 20:39:46]

Done.

+                        const bool cleanup_needed);
 
   // Callback from request picker that receives the current available queued
   // request count as well as the total queued request count (which may be
   // different if unavailable requests are queued such as paused requests).
   // It also receives a flag as to whether this request picking is due to the
   // start of a request processing window.
   void RequestCounts(bool is_start_of_processing,
                      size_t total_requests,
                      size_t available_requests);
 
@@ skipping 127 matching lines @@
   base::Callback<void(bool)> immediate_schedule_callback_;
   // Allows us to pass a weak pointer to callbacks.
   base::WeakPtrFactory<RequestCoordinator> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RequestCoordinator);
 };
 
 }  // namespace offline_pages
 
 #endif  // COMPONENTS_OFFLINE_PAGES_BACKGROUND_REQUEST_COORDINATOR_H_