Adds request queue removal capability to OfflinePageBridge.

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 95 matching lines @@
 }
 
 void RequestCoordinator::GetQueuedRequestsCallback(
     const GetRequestsCallback& callback,
     RequestQueue::GetRequestsResult result,
     const std::vector<SavePageRequest>& requests) {
   callback.Run(requests);
 }
 
 void RequestCoordinator::RemoveRequests(
-    const std::vector<int64_t>& request_ids) {
-  queue_->RemoveRequests(request_ids,
-                         base::Bind(&RequestCoordinator::RemoveRequestsCallback,
-                                    weak_ptr_factory_.GetWeakPtr()));
+    const std::vector<int64_t>& request_ids,
+    const RemoveRequestsCallback& callback) {
+  queue_->RemoveRequests(
+      request_ids,
+      base::Bind(&RequestCoordinator::HandleRemovedRequestsAndCallback,
+                 weak_ptr_factory_.GetWeakPtr(), callback));
 }
 
 void RequestCoordinator::PauseRequests(
     const std::vector<int64_t>& request_ids) {
   queue_->ChangeRequestsState(
       request_ids, SavePageRequest::RequestState::PAUSED,
       base::Bind(&RequestCoordinator::UpdateMultipleRequestsCallback,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
@@ skipping 27 matching lines @@
 }
 
 // Called in response to updating multiple requests in the request queue.
 void RequestCoordinator::UpdateMultipleRequestsCallback(
     const RequestQueue::UpdateMultipleRequestResults& results,
     const std::vector<SavePageRequest>& requests) {
   for (SavePageRequest request : requests)
     NotifyChanged(request);
 }
 
-void RequestCoordinator::RemoveRequestsCallback(
+void RequestCoordinator::HandleRemovedRequestsAndCallback(
+    const RemoveRequestsCallback& callback,
+    const RequestQueue::UpdateMultipleRequestResults& results,
+    const std::vector<SavePageRequest>& requests) {
+  HandleRemovedRequests(results, requests);

[fgorski, 2016/08/19 21:51:19]

3 things that I am not comfortable here:
1. results is never used (even in HandleRemovedRequests)
2. callback should be invoked first if available, followed by notifications
3. since you can probably pass a dummy callback in, you don't need 2 Handle...
methods.

[dewittj, 2016/08/19 21:56:37]

I agree this is concerning; I don't think it's a thing I should solve in this
cl.
Can you explain that rationale?
Since there are multiple HandleRemovedRequests calls, having a dummy callback
would be a bit of noise, is having the second method that bad?

[dewittj, 2016/08/20 03:22:35]

I solved this for my API; However the request coordinator itself doesn't use the
results from the remove operation.
I generally think your explanation makes sense, switched the order.

+  callback.Run(requests);
+}
+
+void RequestCoordinator::HandleRemovedRequests(
     const RequestQueue::UpdateMultipleRequestResults& results,
     const std::vector<SavePageRequest>& requests) {
   for (SavePageRequest request : requests)
     NotifyCompleted(request, SavePageStatus::REMOVED);
 }
 
 void RequestCoordinator::StopProcessing() {
   is_canceled_ = true;
   if (offliner_ && is_busy_) {
     // TODO(dougarnett): Find current request and mark attempt aborted.
@@ skipping 138 matching lines @@
                           base::Bind(&RequestCoordinator::UpdateRequestCallback,
                                      weak_ptr_factory_.GetWeakPtr(),
                                      updated_request.client_id()));
     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,
+        remove_requests, base::Bind(&RequestCoordinator::HandleRemovedRequests,
                                     weak_ptr_factory_.GetWeakPtr()));
     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,
+        remove_requests, base::Bind(&RequestCoordinator::HandleRemovedRequests,
                                     weak_ptr_factory_.GetWeakPtr()));
     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(),
@@ skipping 56 matching lines @@
   FOR_EACH_OBSERVER(Observer, observers_, OnChanged(request));
 }
 
 void RequestCoordinator::GetOffliner() {
   if (!offliner_) {
     offliner_ = factory_->GetOffliner(policy_.get());
   }
 }
 
 }  // namespace offline_pages