[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"
@@ skipping 110 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);
 
+  // Send a notification of the |request| to observers via coordinator.
+  void NotifyAdded(const SavePageRequest& request);
+  void NotifySucceeded(const SavePageRequest& request);
+  virtual void NotifyFailed(const SavePageRequest& request,
+                            SavePageStatus status);
+  void NotifyChanged(const SavePageRequest& request);
+  void NotifyRemoved(const SavePageRequest& request);

[Pete Williamson, 2016/08/16 23:40:46]

FYI: You'll need to do another merge soon, these are changing: See
https://codereview.chromium.org/2249303002/

[romax, 2016/08/17 20:07:58]

Done.

+
   // 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 NotifySucceeded(const SavePageRequest& request);
-  void NotifyFailed(const SavePageRequest& request, SavePageStatus status);
-  void NotifyChanged(const SavePageRequest& request);
-  void NotifyRemoved(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_