Simplify Observer callbacks

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 17 matching lines @@
 class OfflinerFactory;
 class Offliner;
 class RequestPicker;
 class SavePageRequest;
 class Scheduler;
 
 // Coordinates queueing and processing save page later requests.
 class RequestCoordinator : public KeyedService {
  public:
   // Status to return for failed notifications.
   enum class SavePageStatus {

[fgorski, 2016/08/16 22:13:25]

nit: SavePageStatus might no longer be the best name for this enum.
Consider a TODO. I'd vote for CompletionStatus (but as part of a different CL)

[Pete Williamson, 2016/08/16 23:08:52]

Done.

     SUCCESS,
     PRERENDER_FAILURE,
     FOREGROUND_CANCELED,
     SAVE_FAILED,
     EXPIRED,
     RETRY_COUNT_EXCEEDED,
-    REMOVED_BY_CLIENT,
+    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 OnSucceeded(const SavePageRequest& request) = 0;
-    virtual void OnFailed(const SavePageRequest& request,
-                          SavePageStatus status) = 0;
+    virtual void OnCompleted(const SavePageRequest& request,
+                             SavePageStatus status) = 0;
     virtual void OnChanged(const SavePageRequest& request) = 0;
-    virtual void OnRemoved(const SavePageRequest& request,
-                           SavePageStatus status) = 0;
     // TODO(petewil): Merge OnSucceeded, OnFailed, and OnRemoved into a single

[fgorski, 2016/08/16 22:13:25]

remove todo

[Pete Williamson, 2016/08/16 23:08:52]

Done.

     // call.
   };
 
   // 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 113 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 NotifyCompleted(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) {
@@ skipping 39 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_