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

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 31 matching lines @@
   void SetUp() override;
 
   void PumpLoop();
 
   // Callback for adding requests.
   void AddRequestDone(AddRequestResult result, const SavePageRequest& request);
   // Callback for getting requests.
   void GetRequestsDone(GetRequestsResult result,
                        const std::vector<SavePageRequest>& requests);
   // Callback for removing request.
-  void RemoveRequestDone(UpdateRequestResult result);
+  void RemoveRequestDone(
+      const RequestQueue::UpdateMultipleRequestResults& results);
 
   void UpdateRequestDone(UpdateRequestResult result);
 
   RequestQueue* queue() { return queue_.get(); }
 
   AddRequestResult last_add_result() const { return last_add_result_; }
   SavePageRequest* last_added_request() {
     return last_added_request_.get();
   }
 
-  UpdateRequestResult last_remove_result() const { return last_remove_result_; }
+  const RequestQueue::UpdateMultipleRequestResults& last_remove_results()
+      const {
+    return last_remove_results_;
+  }
 
   UpdateRequestResult last_update_result() const { return last_update_result_; }
 
   GetRequestsResult last_get_requests_result() const {
     return last_get_requests_result_;
   }
   const std::vector<SavePageRequest>& last_requests() const {
     return last_requests_;
   }
 
  private:
   AddRequestResult last_add_result_;
   std::unique_ptr<SavePageRequest> last_added_request_;
-
-  UpdateRequestResult last_remove_result_;
+  RequestQueue::UpdateMultipleRequestResults last_remove_results_;
   UpdateRequestResult last_update_result_;
 
   GetRequestsResult last_get_requests_result_;
   std::vector<SavePageRequest> last_requests_;
 
   std::unique_ptr<RequestQueue> queue_;
   scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
   base::ThreadTaskRunnerHandle task_runner_handle_;
 };
 
 RequestQueueTest::RequestQueueTest()
     : last_add_result_(AddRequestResult::STORE_FAILURE),
-      last_remove_result_(UpdateRequestResult::STORE_FAILURE),
       last_update_result_(UpdateRequestResult::STORE_FAILURE),
       last_get_requests_result_(GetRequestsResult::STORE_FAILURE),
       task_runner_(new base::TestSimpleTaskRunner),
       task_runner_handle_(task_runner_) {}
 
 RequestQueueTest::~RequestQueueTest() {}
 
 void RequestQueueTest::SetUp() {
   std::unique_ptr<RequestQueueInMemoryStore> store(
       new RequestQueueInMemoryStore());
@@ skipping 10 matching lines @@
   last_added_request_.reset(new SavePageRequest(request));
 }
 
 void RequestQueueTest::GetRequestsDone(
     GetRequestsResult result,
     const std::vector<SavePageRequest>& requests) {
   last_get_requests_result_ = result;
   last_requests_ = requests;
 }
 
-void RequestQueueTest::RemoveRequestDone(UpdateRequestResult result) {
-  last_remove_result_ = result;
+void RequestQueueTest::RemoveRequestDone(
+    const RequestQueue::UpdateMultipleRequestResults& results) {
+  last_remove_results_ = results;
 }
 
 void RequestQueueTest::UpdateRequestDone(UpdateRequestResult result) {
   last_update_result_ = result;
 }
 
 TEST_F(RequestQueueTest, GetRequestsEmpty) {
   queue()->GetRequests(
       base::Bind(&RequestQueueTest::GetRequestsDone, base::Unretained(this)));
   PumpLoop();
@@ skipping 21 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());
 
-  queue()->RemoveRequest(
-      kRequestId,
+  std::vector<int64_t> remove_requests;
+  remove_requests.push_back(kRequestId);
+  queue()->RemoveRequests(
+      remove_requests,
       base::Bind(&RequestQueueTest::RemoveRequestDone, base::Unretained(this)));
   PumpLoop();
-  ASSERT_EQ(UpdateRequestResult::SUCCESS, last_remove_result());
+  ASSERT_EQ(1ul, last_remove_results().size());
+  ASSERT_EQ(UpdateRequestResult::SUCCESS, last_remove_results().at(0).second);
 
   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, RemoveRequestByClientId) {
+TEST_F(RequestQueueTest, RemoveSeveralRequests) {
   base::Time creation_time = base::Time::Now();
-  // Put two requests on the queue with different client IDs.
   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);
+  queue()->RemoveRequests(
+      remove_requests,
+      base::Bind(&RequestQueueTest::RemoveRequestDone, 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);
 
   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<ClientId> client_ids;
-  client_ids.push_back(kClientId);
-
-  // Removing the first client ID should leave only the second on the queue.
-  queue()->RemoveRequestsByClientId(
-      client_ids,
-      base::Bind(&RequestQueueTest::RemoveRequestDone, base::Unretained(this)));
-  PumpLoop();
-  ASSERT_EQ(UpdateRequestResult::SUCCESS, last_remove_result());
-
-  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(kClientId2, last_requests().front().client_id());
+  ASSERT_EQ(0ul, last_requests().size());
 }
 
 // A longer test populating the request queue with more than one item, properly
 // listing multiple items and removing the right item.
 TEST_F(RequestQueueTest, MultipleRequestsAddGetRemove) {
   base::Time creation_time = base::Time::Now();
   SavePageRequest request1(
       kRequestId, kUrl, kClientId, creation_time, kUserRequested);
   queue()->AddRequest(request1, base::Bind(&RequestQueueTest::AddRequestDone,
                                            base::Unretained(this)));
   PumpLoop();
   ASSERT_EQ(request1.request_id(), 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(request2.request_id(), last_added_request()->request_id());
 
   queue()->GetRequests(
       base::Bind(&RequestQueueTest::GetRequestsDone, base::Unretained(this)));
   PumpLoop();
   ASSERT_EQ(GetRequestsResult::SUCCESS, last_get_requests_result());
   ASSERT_EQ(2ul, last_requests().size());
 
-  queue()->RemoveRequest(
-      request1.request_id(),
+  std::vector<int64_t> remove_requests;
+  remove_requests.push_back(request1.request_id());
+  queue()->RemoveRequests(
+      remove_requests,
       base::Bind(&RequestQueueTest::RemoveRequestDone, base::Unretained(this)));
   PumpLoop();
-  ASSERT_EQ(UpdateRequestResult::SUCCESS, last_remove_result());
+  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);
 
   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()[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