[Offline pages] Applying TaskQueue to RequestQueue::ChangeRequestsState

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>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "components/offline_pages/background/save_page_request.h"
+#include "components/offline_pages/core/task_queue.h"
 #include "components/offline_pages/offline_page_item.h"
+#include "components/offline_pages/offline_store_types.h"
 
 namespace offline_pages {
 
 class RequestQueueStore;
+typedef StoreUpdateResult<SavePageRequest> UpdateRequestsResult;
 
 // Class responsible for managing save page requests.
 class RequestQueue {
  public:
   enum class GetRequestsResult {
     SUCCESS,
     STORE_FAILURE,
   };
 
   enum class AddRequestResult {
@@ skipping 18 matching lines @@
 
   // 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|.
@@ skipping 20 matching lines @@
   // 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);
 
-  // Changes the state to |new_state_ for requests matching the
+  // Changes the state to |new_state| for requests matching the
   // |request_ids|. Results are returned through |callback|.
-  // TODO(petewil): Instead of having one function per property,
-  // modify this to have a single update function that updates an entire
-  // request, and doesn't need to care what updates.
   void ChangeRequestsState(const std::vector<int64_t>& request_ids,
                            const SavePageRequest::RequestState new_state,
-                           const UpdateMultipleRequestsCallback& callback);
+                           const UpdateCallback& callback);
 
   void GetForUpdateDone(
       const RequestQueue::UpdateRequestCallback& update_callback,
       const SavePageRequest& update_request,
       bool success,
       std::vector<std::unique_ptr<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_;
 
+  // Task queue to serialize store access.
+  TaskQueue task_queue_;
+
   // 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_