[Offline pages] Updating RequestQueue::RemoveRequests to use a TaskQueue

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 30 matching lines @@
   };
 
   // GENERATED_JAVA_ENUM_PACKAGE:org.chromium.components.offlinepages.background
   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,
                               std::vector<std::unique_ptr<SavePageRequest>>)>
       GetRequestsCallback;
 
   // Callback used for |AddRequest|.
   typedef base::Callback<void(AddRequestResult, const SavePageRequest& request)>
       AddRequestCallback;
 
   // Callback used by |ChangeRequestsState|.
   typedef base::Callback<void(std::unique_ptr<UpdateRequestsResult>)>
       UpdateCallback;
 
   // Callback used by |UdpateRequest|.
   typedef base::Callback<void(UpdateRequestResult)> UpdateRequestCallback;
 
-  // Callback used by |ChangeState| for more than one update at a time.
-  typedef base::Callback<void(
-      const UpdateMultipleRequestResults& results,
-      std::vector<std::unique_ptr<SavePageRequest>> requests)>
-      UpdateMultipleRequestsCallback;
-
   // Callback used by |RemoveRequests|.
   typedef base::Callback<void(
-      const UpdateMultipleRequestResults& results,
+      const MultipleItemStatuses& results,
       std::vector<std::unique_ptr<SavePageRequest>> requests)>
       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 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 RemoveRequests(const std::vector<int64_t>& request_ids,

[Pete Williamson, 2016/09/30 18:03:53]

Why do we need two functions?

[Pete Williamson, 2016/09/30 18:03:53]

Why do we need two function declarations for RemoveRequests?  Can we get rid of
the other one?

[fgorski, 2016/10/04 17:18:23]

Done.

That was the plan. As you probably guessed, during development I had 2 functions
side by side to gently switch from one to the other.

+                      const UpdateCallback& callback);
+
   // Changes the state to |new_state| for requests matching the
   // |request_ids|. Results are returned through |callback|.
   void ChangeRequestsState(const std::vector<int64_t>& request_ids,
                            const SavePageRequest::RequestState new_state,
                            const UpdateCallback& callback);
 
   void GetForUpdateDone(
       const RequestQueue::UpdateRequestCallback& update_callback,
       const SavePageRequest& update_request,
       bool success,
@@ skipping 17 matching lines @@
 
   // 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_