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 144 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());
 
   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) {
-  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)));
-  SavePageRequest request2(kRequestId2, kUrl2, kClientId2, creation_time,
-                           kUserRequested);
-  queue()->AddRequest(request2, base::Bind(&RequestQueueTest::AddRequestDone,
-                                           base::Unretained(this)));
-  PumpLoop();
-
-  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());
-}
-
 // 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());
 
   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());
@@ skipping 38 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