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

components/offline_pages/background/request_queue_store_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_store.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/offline_pages/background/request_queue_in_memory_store.h"
 #include "components/offline_pages/background/request_queue_store_sql.h"
 #include "components/offline_pages/background/save_page_request.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace offline_pages {
 
 using UpdateStatus = RequestQueueStore::UpdateStatus;
 
 namespace {
 const int64_t kRequestId = 42;
-const int64_t kRequestId2 = 44;
 const GURL kUrl("http://example.com");
 const GURL kUrl2("http://another-example.com");
 const ClientId kClientId("bookmark", "1234");
 const ClientId kClientId2("async", "5678");
 const bool kUserRequested = true;
 
 enum class LastResult {
   kNone,
   kFalse,
   kTrue,
@@ skipping 254 matching lines @@
   store->RemoveRequests(request_ids,
                         base::Bind(&RequestQueueStoreTestBase::RemoveDone,
                                    base::Unretained(this)));
   ASSERT_EQ(LastResult::kNone, this->last_result());
   ASSERT_EQ(0, this->last_remove_count());
   this->PumpLoop();
   ASSERT_EQ(LastResult::kTrue, this->last_result());
   ASSERT_EQ(0, this->last_remove_count());
 }
 
-TYPED_TEST(RequestQueueStoreTest, RemoveRequestByClientId) {
-  std::unique_ptr<RequestQueueStore> store(this->BuildStore());
-  base::Time creation_time = base::Time::Now();
-
-  // Create requests and add them to the queue.
-  SavePageRequest request1(kRequestId, kUrl, kClientId, creation_time,
-                                   kUserRequested);
-  SavePageRequest request2(kRequestId2, kUrl2, kClientId2, creation_time,
-                                   kUserRequested);
-  store->AddOrUpdateRequest(
-      request1, base::Bind(&RequestQueueStoreTestBase::AddOrUpdateDone,
-                           base::Unretained(this)));
-  store->AddOrUpdateRequest(
-      request2, base::Bind(&RequestQueueStoreTestBase::AddOrUpdateDone,
-                           base::Unretained(this)));
-  this->PumpLoop();
-  this->ClearResults();
-
-  // Remove a request.
-  std::vector<ClientId> client_ids_to_delete{kClientId};
-  store->RemoveRequestsByClientId(
-      client_ids_to_delete,
-      base::Bind(
-          &RequestQueueStoreTestBase::RemoveDone, base::Unretained(this)));
-  ASSERT_EQ(LastResult::kNone, this->last_result());
-  ASSERT_EQ(0, this->last_remove_count());
-  this->PumpLoop();
-  ASSERT_EQ(LastResult::kTrue, this->last_result());
-  ASSERT_EQ(1, this->last_remove_count());
-  this->ClearResults();
-
-  // Check to see what remains in the queue.  Removed request should be gone.
-  store->GetRequests(base::Bind(&RequestQueueStoreTestBase::GetRequestsDone,
-                                base::Unretained(this)));
-  this->PumpLoop();
-  ASSERT_EQ(LastResult::kTrue, this->last_result());
-  // The other request should still be in the queue.
-  ASSERT_EQ(1UL, this->last_requests().size());
-  ASSERT_EQ(kClientId2, this->last_requests().at(0).client_id());
-  this->ClearResults();
-
-  // Try to remove a request that is not in the queue.
-  store->RemoveRequestsByClientId(
-      client_ids_to_delete,
-      base::Bind(
-          &RequestQueueStoreTestBase::RemoveDone, base::Unretained(this)));
-  this->PumpLoop();
-  ASSERT_EQ(LastResult::kTrue, this->last_result());
-  ASSERT_EQ(0, this->last_remove_count());
-}
-
-TYPED_TEST(RequestQueueStoreTest, RemoveRequestWithSameClientId) {
-  std::unique_ptr<RequestQueueStore> store(this->BuildStore());
-  base::Time creation_time = base::Time::Now();
-
-  // Create requests and add them to the queue.
-  SavePageRequest request1(kRequestId, kUrl, kClientId, creation_time,
-                                   kUserRequested);
-  SavePageRequest request2(kRequestId2, kUrl2, kClientId, creation_time,
-                                   kUserRequested);
-  store->AddOrUpdateRequest(
-      request1, base::Bind(&RequestQueueStoreTestBase::AddOrUpdateDone,
-                           base::Unretained(this)));
-  store->AddOrUpdateRequest(
-      request2, base::Bind(&RequestQueueStoreTestBase::AddOrUpdateDone,
-                           base::Unretained(this)));
-  this->PumpLoop();
-  this->ClearResults();
-
-  // Remove a request.
-  std::vector<ClientId> client_ids_to_delete{kClientId};
-  store->RemoveRequestsByClientId(
-      client_ids_to_delete,
-      base::Bind(
-          &RequestQueueStoreTestBase::RemoveDone, base::Unretained(this)));
-  ASSERT_EQ(LastResult::kNone, this->last_result());
-  ASSERT_EQ(0, this->last_remove_count());
-  this->PumpLoop();
-  ASSERT_EQ(LastResult::kTrue, this->last_result());
-  ASSERT_EQ(2, this->last_remove_count());
-  this->ClearResults();
-
-  // Check to see what remains in the queue.  Removed request should be gone.
-  store->GetRequests(base::Bind(&RequestQueueStoreTestBase::GetRequestsDone,
-                                base::Unretained(this)));
-  this->PumpLoop();
-  ASSERT_EQ(LastResult::kTrue, this->last_result());
-  // The other request should still be in the queue.
-  ASSERT_TRUE(this->last_requests().empty());
-  this->ClearResults();
-}
-
 TYPED_TEST(RequestQueueStoreTest, ResetStore) {
   std::unique_ptr<RequestQueueStore> store(this->BuildStore());
   base::Time creation_time = base::Time::Now();
   SavePageRequest original_request(
       kRequestId, kUrl, kClientId, creation_time, kUserRequested);
   store->AddOrUpdateRequest(
       original_request, base::Bind(&RequestQueueStoreTestBase::AddOrUpdateDone,
                                    base::Unretained(this)));
   this->PumpLoop();
   this->ClearResults();
@@ skipping 35 matching lines @@
   store->GetRequests(base::Bind(&RequestQueueStoreTestBase::GetRequestsDone,
                                 base::Unretained(this)));
   ASSERT_EQ(LastResult::kNone, this->last_result());
   this->PumpLoop();
   ASSERT_EQ(LastResult::kTrue, this->last_result());
   ASSERT_EQ(1ul, this->last_requests().size());
   ASSERT_TRUE(original_request == this->last_requests()[0]);
 }
 
 }  // offline_pages