Simplify Observer callbacks

components/offline_pages/background/request_coordinator.cc

 // 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.
 
 #include "components/offline_pages/background/request_coordinator.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 146 matching lines @@
     const RequestQueue::UpdateMultipleRequestResults& results,
     const std::vector<SavePageRequest>& requests) {
   for (SavePageRequest request : requests)
     NotifyChanged(request);
 }
 
 void RequestCoordinator::RemoveRequestsCallback(
     const RequestQueue::UpdateMultipleRequestResults& results,
     const std::vector<SavePageRequest>& requests) {
   for (SavePageRequest request : requests)
-    NotifyRemoved(request);
+    NotifyCompleted(request, SavePageStatus::REMOVED);
 }
 
 void RequestCoordinator::StopProcessing() {
   is_canceled_ = true;
   if (offliner_ && is_busy_) {
     // TODO(dougarnett): Find current request and mark attempt aborted.
     offliner_->Cancel();
   }
 
   // Stopping offliner means it will not call callback.
@@ skipping 127 matching lines @@
   if (status == Offliner::RequestStatus::FOREGROUND_CANCELED) {
     // Update the request for the canceled attempt.
     // TODO(dougarnett): See if we can conclusively identify other attempt
     // aborted cases to treat this way (eg, for Render Process Killed).
     SavePageRequest updated_request(request);
     updated_request.MarkAttemptAborted();
     queue_->UpdateRequest(updated_request,
                           base::Bind(&RequestCoordinator::UpdateRequestCallback,
                                      weak_ptr_factory_.GetWeakPtr(),
                                      updated_request.client_id()));
-    NotifyFailed(updated_request, SavePageStatus::FOREGROUND_CANCELED);
+    NotifyCompleted(updated_request, SavePageStatus::FOREGROUND_CANCELED);
 
   } else if (status == Offliner::RequestStatus::SAVED) {
     // Remove the request from the queue if it succeeded.
     std::vector<int64_t> remove_requests;
     remove_requests.push_back(request.request_id());
     queue_->RemoveRequests(
         remove_requests, base::Bind(&RequestCoordinator::RemoveRequestsCallback,
                                     weak_ptr_factory_.GetWeakPtr()));
-    NotifySucceeded(request);
+    NotifyCompleted(request, SavePageStatus::SUCCESS);
   } else if (request.completed_attempt_count() + 1 >=
              policy_->GetMaxCompletedTries()) {
     // Remove from the request queue if we exceeeded max retries. The +1
     // represents the request that just completed. Since we call
     // MarkAttemptCompleted within the if branches, the completed_attempt_count
     // has not yet been updated when we are checking the if condition.
     std::vector<int64_t> remove_requests;
     remove_requests.push_back(request.request_id());
     queue_->RemoveRequests(
         remove_requests, base::Bind(&RequestCoordinator::RemoveRequestsCallback,
                                     weak_ptr_factory_.GetWeakPtr()));
-    NotifyFailed(request, SavePageStatus::RETRY_COUNT_EXCEEDED);
+    NotifyCompleted(request, SavePageStatus::RETRY_COUNT_EXCEEDED);
   } else {
     // If we failed, but are not over the limit, update the request in the
     // queue.
     SavePageRequest updated_request(request);
     updated_request.MarkAttemptCompleted();
     queue_->UpdateRequest(updated_request,
                           base::Bind(&RequestCoordinator::UpdateRequestCallback,
                                      weak_ptr_factory_.GetWeakPtr(),
                                      updated_request.client_id()));
     NotifyChanged(updated_request);
@@ skipping 38 matching lines @@
 }
 
 void RequestCoordinator::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void RequestCoordinator::NotifyAdded(const SavePageRequest& request) {
   FOR_EACH_OBSERVER(Observer, observers_, OnAdded(request));
 }
 
-void RequestCoordinator::NotifySucceeded(const SavePageRequest& request) {
-  FOR_EACH_OBSERVER(Observer, observers_, OnSucceeded(request));
-}
-
-void RequestCoordinator::NotifyFailed(const SavePageRequest& request,
-                                      SavePageStatus status) {
-  FOR_EACH_OBSERVER(Observer, observers_, OnFailed(request, status));
+void RequestCoordinator::NotifyCompleted(const SavePageRequest& request,
+                                         SavePageStatus status) {
+  FOR_EACH_OBSERVER(Observer, observers_, OnCompleted(request, status));
 }
 
 void RequestCoordinator::NotifyChanged(const SavePageRequest& request) {
   FOR_EACH_OBSERVER(Observer, observers_, OnChanged(request));
 }
 
-void RequestCoordinator::NotifyRemoved(const SavePageRequest& request) {
-  FOR_EACH_OBSERVER(Observer, observers_,
-                    OnRemoved(request, SavePageStatus::REMOVED_BY_CLIENT));
-}
-
 void RequestCoordinator::GetOffliner() {
   if (!offliner_) {
     offliner_ = factory_->GetOffliner(policy_.get());
   }
 }
 
 }  // namespace offline_pages