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

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 12 matching lines @@
 // Data for request 1.
 const int64_t kRequestId = 42;
 const GURL kUrl("http://example.com");
 const ClientId kClientId("bookmark", "1234");
 const int64_t kRetryCount = 2;
 // Data for request 2.
 const int64_t kRequestId2 = 77;
 const GURL kUrl2("http://test.com");
 const ClientId kClientId2("bookmark", "567");
 const bool kUserRequested = true;
+const int64_t kRequestId3 = 99;
 }  // namespace
 
 // TODO(fgorski): Add tests for store failures in add/remove/get.
 class RequestQueueTest : public testing::Test {
  public:
   RequestQueueTest();
   ~RequestQueueTest() override;
 
   // Test overrides.
   void SetUp() override;
 
   void PumpLoop();
 
   // 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 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 22 matching lines @@
   last_added_request_.reset(new SavePageRequest(request));
 }
 
 void RequestQueueTest::GetRequestsDone(
     GetRequestsResult result,
     std::vector<std::unique_ptr<SavePageRequest>> requests) {
   last_get_requests_result_ = result;
   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::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) {
@@ skipping 24 matching lines @@
 
 TEST_F(RequestQueueTest, RemoveRequest) {
   base::Time creation_time = base::Time::Now();
   SavePageRequest request(
       kRequestId, kUrl, kClientId, creation_time, kUserRequested);
   queue()->AddRequest(request, base::Bind(&RequestQueueTest::AddRequestDone,
                                           base::Unretained(this)));
   PumpLoop();
   ASSERT_EQ(kRequestId, last_added_request()->request_id());
 
-  std::vector<int64_t> remove_requests;
-  remove_requests.push_back(kRequestId);
+  std::vector<int64_t> remove_requests{kRequestId};
   queue()->RemoveRequests(remove_requests,
-                          base::Bind(&RequestQueueTest::RemoveRequestsDone,
+                          base::Bind(&RequestQueueTest::UpdateRequestsDone,
                                      base::Unretained(this)));
   PumpLoop();
-  ASSERT_EQ(1ul, last_remove_results().size());
-  ASSERT_EQ(UpdateRequestResult::SUCCESS, last_remove_results().at(0).second);
+  EXPECT_EQ(1ul, update_requests_result()->item_statuses.size());
+  EXPECT_EQ(kRequestId, update_requests_result()->item_statuses.at(0).first);
+  EXPECT_EQ(ItemActionStatus::SUCCESS,
+            update_requests_result()->item_statuses.at(0).second);
+  EXPECT_EQ(1UL, update_requests_result()->updated_items.size());
+  EXPECT_EQ(request, update_requests_result()->updated_items.at(0));
 
   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, RemoveSeveralRequests) {
   base::Time creation_time = base::Time::Now();
   SavePageRequest request(kRequestId, kUrl, kClientId, creation_time,
                           kUserRequested);
   queue()->AddRequest(request, base::Bind(&RequestQueueTest::AddRequestDone,
                                           base::Unretained(this)));
   PumpLoop();
   ASSERT_EQ(kRequestId, last_added_request()->request_id());
 
   SavePageRequest request2(kRequestId2, kUrl2, kClientId2, creation_time,
                            kUserRequested);
   queue()->AddRequest(request2, base::Bind(&RequestQueueTest::AddRequestDone,
                                            base::Unretained(this)));
   PumpLoop();
   ASSERT_EQ(kRequestId2, last_added_request()->request_id());
 
   std::vector<int64_t> remove_requests;
   remove_requests.push_back(kRequestId);
   remove_requests.push_back(kRequestId2);
+  remove_requests.push_back(kRequestId3);
   queue()->RemoveRequests(remove_requests,
-                          base::Bind(&RequestQueueTest::RemoveRequestsDone,
+                          base::Bind(&RequestQueueTest::UpdateRequestsDone,
                                      base::Unretained(this)));
   PumpLoop();
-  ASSERT_EQ(2ul, last_remove_results().size());
-  ASSERT_EQ(UpdateRequestResult::SUCCESS, last_remove_results().at(0).second);
-  ASSERT_EQ(UpdateRequestResult::SUCCESS, last_remove_results().at(1).second);
-  ASSERT_EQ(kRequestId, last_remove_results().at(0).first);
-  ASSERT_EQ(kRequestId2, last_remove_results().at(1).first);
+  ASSERT_EQ(3ul, 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(kRequestId2, update_requests_result()->item_statuses.at(1).first);
+  ASSERT_EQ(ItemActionStatus::SUCCESS,
+            update_requests_result()->item_statuses.at(1).second);
+  ASSERT_EQ(kRequestId3, update_requests_result()->item_statuses.at(2).first);
+  ASSERT_EQ(ItemActionStatus::NOT_FOUND,
+            update_requests_result()->item_statuses.at(2).second);
+  EXPECT_EQ(2UL, update_requests_result()->updated_items.size());
+  EXPECT_EQ(request, update_requests_result()->updated_items.at(0));
+  EXPECT_EQ(request2, update_requests_result()->updated_items.at(1));
 
   queue()->GetRequests(
       base::Bind(&RequestQueueTest::GetRequestsDone, base::Unretained(this)));
   PumpLoop();
 
   // Verify both requests are no longer in the queue.
   ASSERT_EQ(GetRequestsResult::SUCCESS, last_get_requests_result());
   ASSERT_EQ(0ul, last_requests().size());
 }
 
@@ skipping 83 matching lines @@
 
   queue()->GetRequests(
       base::Bind(&RequestQueueTest::GetRequestsDone, base::Unretained(this)));
   PumpLoop();
   ASSERT_EQ(GetRequestsResult::SUCCESS, last_get_requests_result());
   ASSERT_EQ(2ul, last_requests().size());
 
   std::vector<int64_t> remove_requests;
   remove_requests.push_back(request1.request_id());
   queue()->RemoveRequests(remove_requests,
-                          base::Bind(&RequestQueueTest::RemoveRequestsDone,
+                          base::Bind(&RequestQueueTest::UpdateRequestsDone,
                                      base::Unretained(this)));
   PumpLoop();
-  ASSERT_EQ(1ul, last_remove_results().size());
-  ASSERT_EQ(kRequestId, last_remove_results().at(0).first);
-  ASSERT_EQ(UpdateRequestResult::SUCCESS, last_remove_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);
 
   queue()->GetRequests(
       base::Bind(&RequestQueueTest::GetRequestsDone, base::Unretained(this)));
   PumpLoop();
   ASSERT_EQ(GetRequestsResult::SUCCESS, last_get_requests_result());
   ASSERT_EQ(1ul, last_requests().size());
   ASSERT_EQ(request2.request_id(), last_requests().at(0)->request_id());
 }
 
 TEST_F(RequestQueueTest, UpdateRequest) {
@@ skipping 35 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