[Offline Pages] Remove expired requests from the queue.

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 "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/offline_pages/background/device_conditions.h"
 #include "components/offline_pages/background/offliner.h"
 #include "components/offline_pages/background/request_coordinator_event_logger.h"
+#include "components/offline_pages/background/request_notifier.h"
 #include "components/offline_pages/background/request_queue.h"
 #include "components/offline_pages/background/scheduler.h"
 #include "url/gurl.h"
 
 namespace offline_pages {
 
 struct ClientId;
 class OfflinerPolicy;
 class OfflinerFactory;
 class Offliner;
 class RequestPicker;
 class SavePageRequest;
 class Scheduler;
 
 // Coordinates queueing and processing save page later requests.
-class RequestCoordinator : public KeyedService {
+class RequestCoordinator : public KeyedService, public RequestNotifier {
  public:
-  // Status to return for failed notifications.
-  // TODO(petewil): Can we find a better name for this enum?
-  enum class SavePageStatus {
-    SUCCESS,
-    PRERENDER_FAILURE,
-    FOREGROUND_CANCELED,
-    SAVE_FAILED,
-    EXPIRED,
-    RETRY_COUNT_EXCEEDED,
-    REMOVED,
-  };
 
   // Nested observer class.  To make sure that no events are missed, the client
   // code should first register for notifications, then |GetAllRequests|, and
   // ignore all events before the return from |GetAllRequests|, and consume
   // events after the return callback from |GetAllRequests|.
   class Observer {
    public:
     virtual void OnAdded(const SavePageRequest& request) = 0;
     virtual void OnCompleted(const SavePageRequest& request,
-                             SavePageStatus status) = 0;
+                             RequestNotifier::SavePageStatus status) = 0;
     virtual void OnChanged(const SavePageRequest& request) = 0;
   };
 
   // Callback to report when the processing of a triggered task is complete.
   typedef base::Callback<void(const SavePageRequest& request)>
       RequestPickedCallback;
   typedef base::Callback<void()> RequestQueueEmptyCallback;
 
   RequestCoordinator(std::unique_ptr<OfflinerPolicy> policy,
                      std::unique_ptr<OfflinerFactory> factory,
@@ skipping 49 matching lines @@
   }
 
   // Observers implementing the RequestCoordinator::Observer interface can
   // register here to get notifications of changes to request state.  This
   // pointer is not owned, and it is the callers responsibility to remove the
   // observer before the observer is deleted.
   void AddObserver(RequestCoordinator::Observer* observer);
 
   void RemoveObserver(RequestCoordinator::Observer* observer);
 
+  // Implement RequestNotifier
+  void NotifyAdded(const SavePageRequest& request) override;
+  void NotifyCompleted(const SavePageRequest& request,
+                       RequestNotifier::SavePageStatus status) override;
+  void NotifyChanged(const SavePageRequest& request) override;
+
   // Returns the request queue used for requests.  Coordinator keeps ownership.
   RequestQueue* queue() { return queue_.get(); }
 
   // Return an unowned pointer to the Scheduler.
   Scheduler* scheduler() { return scheduler_.get(); }
 
   // Returns the status of the most recent offlining.
   Offliner::RequestStatus last_offlining_status() {
     return last_offlining_status_;
   }
@@ skipping 43 matching lines @@
 
   void SendRequestToOffliner(const SavePageRequest& request);
 
   // Called by the offliner when an offlining request is completed. (and by
   // tests).
   void OfflinerDoneCallback(const SavePageRequest& request,
                             Offliner::RequestStatus status);
 
   void TryNextRequest();
 
-  void NotifyAdded(const SavePageRequest& request);
-  void NotifyCompleted(const SavePageRequest& request, SavePageStatus status);
-  void NotifyChanged(const SavePageRequest& request);
-
   // Returns the appropriate offliner to use, getting a new one from the factory
   // if needed.
   void GetOffliner();
 
   void SetOfflinerTimeoutForTest(const base::TimeDelta& timeout) {
     offliner_timeout_ = timeout;
   }
 
   void SetDeviceConditionsForTest(DeviceConditions& current_conditions) {
     current_conditions_.reset(new DeviceConditions(current_conditions));
@@ skipping 38 matching lines @@
   base::TimeDelta offliner_timeout_;
   // 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_