[Offline pages] Applying TaskQueue to RequestQueue::ChangeRequestsState

components/offline_pages/background/request_queue_unittest.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_queue.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/test/test_simple_task_runner.h"
@@ skipping 35 matching lines @@
   // Callback for adding requests.
   void AddRequestDone(AddRequestResult result, const SavePageRequest& request);
   // Callback for getting requests.
   void GetRequestsDone(GetRequestsResult result,
                        std::vector<std::unique_ptr<SavePageRequest>> requests);
   // Callback for removing request.
   void RemoveRequestsDone(
       const RequestQueue::UpdateMultipleRequestResults& results,
       std::vector<std::unique_ptr<SavePageRequest>> requests);
 
-  void UpdateMultipleRequestsDone(
-      const RequestQueue::UpdateMultipleRequestResults& results,
-      std::vector<std::unique_ptr<SavePageRequest>> requests);
-
   void UpdateRequestDone(UpdateRequestResult result);
+  void UpdateRequestsDone(std::unique_ptr<UpdateRequestsResult> result);
 
   RequestQueue* queue() { return queue_.get(); }
 
   AddRequestResult last_add_result() const { return last_add_result_; }
   SavePageRequest* last_added_request() {
     return last_added_request_.get();
   }
 
   const RequestQueue::UpdateMultipleRequestResults& last_remove_results()
       const {
     return last_remove_results_;
   }
 
   const RequestQueue::UpdateMultipleRequestResults&
   last_multiple_update_results() const {
     return last_multiple_update_results_;
   }
 
   UpdateRequestResult last_update_result() const { return last_update_result_; }
 
   GetRequestsResult last_get_requests_result() const {
     return last_get_requests_result_;
   }
+
   const std::vector<std::unique_ptr<SavePageRequest>>& last_requests() const {
     return last_requests_;
   }
 
+  UpdateRequestsResult* update_requests_result() const {
+    return update_requests_result_.get();
+  }
+
  private:
   AddRequestResult last_add_result_;
   std::unique_ptr<SavePageRequest> last_added_request_;
+  std::unique_ptr<UpdateRequestsResult> update_requests_result_;
   RequestQueue::UpdateMultipleRequestResults last_remove_results_;
   RequestQueue::UpdateMultipleRequestResults last_multiple_update_results_;
   UpdateRequestResult last_update_result_;
 
   GetRequestsResult last_get_requests_result_;
   std::vector<std::unique_ptr<SavePageRequest>> last_requests_;
 
   std::unique_ptr<RequestQueue> queue_;
   scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
   base::ThreadTaskRunnerHandle task_runner_handle_;
@@ skipping 31 matching lines @@
   last_requests_ = std::move(requests);
 }
 
 void RequestQueueTest::RemoveRequestsDone(
     const RequestQueue::UpdateMultipleRequestResults& results,
     std::vector<std::unique_ptr<SavePageRequest>> requests) {
   last_remove_results_ = results;
   last_requests_ = std::move(requests);
 }
 
-void RequestQueueTest::UpdateMultipleRequestsDone(
-    const RequestQueue::UpdateMultipleRequestResults& results,
-    std::vector<std::unique_ptr<SavePageRequest>> requests) {
-  last_multiple_update_results_ = results;
-  last_requests_ = std::move(requests);
-}
-
 void RequestQueueTest::UpdateRequestDone(UpdateRequestResult result) {
   last_update_result_ = result;
 }
 
+void RequestQueueTest::UpdateRequestsDone(
+    std::unique_ptr<UpdateRequestsResult> result) {
+  update_requests_result_ = std::move(result);
+}
+
 TEST_F(RequestQueueTest, GetRequestsEmpty) {
   queue()->GetRequests(
       base::Bind(&RequestQueueTest::GetRequestsDone, base::Unretained(this)));
   PumpLoop();
   ASSERT_EQ(GetRequestsResult::SUCCESS, last_get_requests_result());
   ASSERT_EQ(0ul, last_requests().size());
 }
 
 TEST_F(RequestQueueTest, AddRequest) {
   base::Time creation_time = base::Time::Now();
@@ skipping 88 matching lines @@
   queue()->GetRequests(
       base::Bind(&RequestQueueTest::GetRequestsDone, base::Unretained(this)));
   PumpLoop();
   ASSERT_EQ(GetRequestsResult::SUCCESS, last_get_requests_result());
   ASSERT_EQ(1ul, last_requests().size());
 
   std::vector<int64_t> request_ids;
   request_ids.push_back(kRequestId);
 
   // Pause the request.
-  queue()->ChangeRequestsState(
-      request_ids, SavePageRequest::RequestState::PAUSED,
-      base::Bind(&RequestQueueTest::UpdateMultipleRequestsDone,
-                 base::Unretained(this)));
+  queue()->ChangeRequestsState(request_ids,
+                               SavePageRequest::RequestState::PAUSED,
+                               base::Bind(&RequestQueueTest::UpdateRequestsDone,
+                                          base::Unretained(this)));
   PumpLoop();
-  ASSERT_EQ(1ul, last_multiple_update_results().size());
-  ASSERT_EQ(UpdateRequestResult::SUCCESS,
-            last_multiple_update_results().at(0).second);
+  ASSERT_EQ(1ul, update_requests_result()->item_statuses.size());
+  ASSERT_EQ(kRequestId, update_requests_result()->item_statuses.at(0).first);
+  ASSERT_EQ(ItemActionStatus::SUCCESS,
+            update_requests_result()->item_statuses.at(0).second);
+  ASSERT_EQ(1ul, update_requests_result()->updated_items.size());
+  ASSERT_EQ(SavePageRequest::RequestState::PAUSED,
+            update_requests_result()->updated_items.at(0).request_state());
 
   queue()->GetRequests(
       base::Bind(&RequestQueueTest::GetRequestsDone, base::Unretained(this)));
   PumpLoop();
 
   // Verify the request is paused.
   ASSERT_EQ(GetRequestsResult::SUCCESS, last_get_requests_result());
   ASSERT_EQ(1ul, last_requests().size());
   ASSERT_EQ(SavePageRequest::RequestState::PAUSED,
             last_requests().at(0)->request_state());
 
   // Resume the request.
-  queue()->ChangeRequestsState(
-      request_ids, SavePageRequest::RequestState::AVAILABLE,
-      base::Bind(&RequestQueueTest::UpdateMultipleRequestsDone,
-                 base::Unretained(this)));
+  queue()->ChangeRequestsState(request_ids,
+                               SavePageRequest::RequestState::AVAILABLE,
+                               base::Bind(&RequestQueueTest::UpdateRequestsDone,
+                                          base::Unretained(this)));
   PumpLoop();
-  ASSERT_EQ(1ul, last_multiple_update_results().size());
-  ASSERT_EQ(UpdateRequestResult::SUCCESS,
-            last_multiple_update_results().at(0).second);
+  ASSERT_EQ(1ul, update_requests_result()->item_statuses.size());
+  ASSERT_EQ(kRequestId, update_requests_result()->item_statuses.at(0).first);
+  ASSERT_EQ(ItemActionStatus::SUCCESS,
+            update_requests_result()->item_statuses.at(0).second);
+  ASSERT_EQ(1ul, update_requests_result()->updated_items.size());
+  ASSERT_EQ(SavePageRequest::RequestState::AVAILABLE,
+            update_requests_result()->updated_items.at(0).request_state());
 
   queue()->GetRequests(
       base::Bind(&RequestQueueTest::GetRequestsDone, base::Unretained(this)));
   PumpLoop();
 
   // Verify the request is no longer paused.
   ASSERT_EQ(GetRequestsResult::SUCCESS, last_get_requests_result());
   ASSERT_EQ(1ul, last_requests().size());
   ASSERT_EQ(SavePageRequest::RequestState::AVAILABLE,
             last_requests().at(0)->request_state());
@@ skipping 79 matching lines @@
 
   // Try to update request1 when only request2 is in the queue.
   queue()->UpdateRequest(
       request1,
       base::Bind(&RequestQueueTest::UpdateRequestDone, base::Unretained(this)));
   PumpLoop();
   ASSERT_EQ(UpdateRequestResult::REQUEST_DOES_NOT_EXIST, last_update_result());
 }
 
 }  // namespace offline_pages