Changes to fit better with the needs of the download manager.

components/offline_pages/background/request_queue.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_QUEUE_H_
 #define COMPONENTS_OFFLINE_PAGES_BACKGROUND_REQUEST_QUEUE_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 25 matching lines @@
                         // reached a quota of active requests.
   };
 
   enum class UpdateRequestResult {
     SUCCESS,
     STORE_FAILURE,
     REQUEST_DOES_NOT_EXIST,  // Failed to delete the request because it does not
                              // exist.
   };
 
+  // Type for a pair of request_id and result.
+  typedef std::vector<std::pair<int64_t, UpdateRequestResult>>
+      UpdateMultipleRequestResults;
+
   // Callback used for |GetRequests|.
   typedef base::Callback<void(GetRequestsResult,
                               const std::vector<SavePageRequest>&)>
       GetRequestsCallback;
 
   // Callback used for |AddRequest|.
   typedef base::Callback<void(AddRequestResult, const SavePageRequest& request)>
       AddRequestCallback;
 
-  // Callback used by |UdpateRequest| and |RemoveRequest|.
+  // Callback used by |UdpateRequest|.
   typedef base::Callback<void(UpdateRequestResult)> UpdateRequestCallback;
 
+  // Callback used by |RemoveRequests|.
+  typedef base::Callback<void(const UpdateMultipleRequestResults& results)>
+      RemoveRequestsCallback;
+
   explicit RequestQueue(std::unique_ptr<RequestQueueStore> store);
   ~RequestQueue();
 
   // Gets all of the active requests from the store. Calling this method may
   // schedule purging of the request queue.
   void GetRequests(const GetRequestsCallback& callback);
 
   // Adds |request| to the request queue. Result is returned through |callback|.
   // In case adding the request violates policy, the result will fail with
   // appropriate result. Callback will also return a copy of a request with all
   // fields set.
   void AddRequest(const SavePageRequest& request,
                   const AddRequestCallback& callback);
 
   // Updates a request in the request queue if a request with matching ID
   // exists. Does nothing otherwise. Result is returned through |callback|.
   void UpdateRequest(const SavePageRequest& request,
                      const UpdateRequestCallback& callback);
 
-  // Removes the request matching the |request_id|. Result is returned through
-  // |callback|.
-  void RemoveRequest(int64_t request_id, const UpdateRequestCallback& callback);
-
-  // Removes the requests matching the |client_ids|. Results are returned
-  // through |callback|.
-  void RemoveRequestsByClientId(const std::vector<ClientId>& client_id,
-                                const UpdateRequestCallback& callback);
+  // Removes the requests matching the |request_ids|. Result is returned through
+  // |callback|.  If a request id cannot be removed, this will still remove the
+  // others.
+  void RemoveRequests(const std::vector<int64_t>& request_ids,
+                      const RemoveRequestsCallback& callback);
 
   void GetForUpdateDone(
       const RequestQueue::UpdateRequestCallback& update_callback,
       const SavePageRequest& update_request,
       bool success,
       const std::vector<SavePageRequest>& requests);
 
  private:
   // Callback used by |PurgeRequests|.
   typedef base::Callback<void(UpdateRequestResult,
                               int /* removed requests count */)>
       PurgeRequestsCallback;
 
   // Purges the queue, removing the requests that are no longer relevant, e.g.
   // expired request. Result is returned through |callback| carries the number
   // of removed requests.
   void PurgeRequests(const PurgeRequestsCallback& callback);
 
   std::unique_ptr<RequestQueueStore> store_;
 
   // Allows us to pass a weak pointer to callbacks.
   base::WeakPtrFactory<RequestQueue> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RequestQueue);
 };
 
 }  // namespace offline_pages
 
 #endif  // COMPONENTS_OFFLINE_PAGES_BACKGROUND_REQUEST_QUEUE_H_