Split the RequestPicker task into two separate tasks.

components/offline_pages/background/cleanup_task_factory.h

Index: components/offline_pages/background/cleanup_task_factory.h
diff --git a/components/offline_pages/background/cleanup_task_factory.h b/components/offline_pages/background/cleanup_task_factory.h
new file mode 100644
index 0000000000000000000000000000000000000000..15ef5965edc1cba230bdf68cb620808016091cf6
--- /dev/null
+++ b/components/offline_pages/background/cleanup_task_factory.h
@@ -0,0 +1,42 @@
+// 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_CLEANUP_TASK_FACTORY_H_
+#define COMPONENTS_OFFLINE_PAGES_BACKGROUND_CLEANUP_TASK_FACTORY_H_
+
+#include <stdint.h>
+
+#include <set>
+
+#include "components/offline_pages/background/cleanup_task.h"
+
+namespace offline_pages {
+
+class OfflinerPolicy;
+class RequestCoordinatorEventLogger;
+class RequestNotifier;
+class RequestQueueStore;
+
+class CleanupTaskFactory {
+ public:
+  CleanupTaskFactory(OfflinerPolicy* policy,
+                     RequestNotifier* notifier,
+                     RequestCoordinatorEventLogger* event_logger);
+
+  ~CleanupTaskFactory();
+
+  std::unique_ptr<CleanupTask> CreateCleanupTask(RequestQueueStore* store);
+
+ private:
+  // Unowned pointer to the Policy
+  OfflinerPolicy* policy_;
+  // Unowned pointer to the notifier
+  RequestNotifier* notifier_;
+  // Unowned pointer to the EventLogger
+  RequestCoordinatorEventLogger* event_logger_;
+};
+
+}  // namespace offline_pages
+
+#endif  // COMPONENTS_OFFLINE_PAGES_BACKGROUND_CLEANUP_TASK_FACTORY_H_