[Offline pages] Removing RequestQueueStore::UpdateMultipleRequestsCallback

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"
@@ skipping 377 matching lines @@
   store->AddRequest(request1,
                     base::Bind(&RequestQueueStoreTestBase::AddRequestDone,
                                base::Unretained(this)));
   this->PumpLoop();
   this->ClearResults();
 
   // Pause a request.
   std::vector<int64_t> request_ids{kRequestId};
   store->ChangeRequestsState(
       request_ids, SavePageRequest::RequestState::PAUSED,
-      base::Bind(&RequestQueueStoreTestBase::UpdateMultipleRequestsDone,
+      base::Bind(&RequestQueueStoreTestBase::UpdateRequestDone,
                  base::Unretained(this)));
-  ASSERT_EQ(LastResult::kNone, this->last_result());
+
+  ASSERT_FALSE(this->last_update_result());
   this->PumpLoop();
 
-  // Verify pause succeeded
-  ASSERT_EQ(1ul, this->last_multiple_update_results().size());
-  ASSERT_EQ(RequestQueue::UpdateRequestResult::SUCCESS,
-            this->last_multiple_update_results().at(0).second);
-  ASSERT_EQ(kRequestId, this->last_requests().at(0)->request_id());
+  // Marking request paused for verification.
+  SavePageRequest paused_request1(request1);
+  paused_request1.MarkAttemptPaused();
+
+  ASSERT_TRUE(this->last_update_result());
+  EXPECT_EQ(1UL, this->last_update_result()->item_statuses.size());
+  EXPECT_EQ(kRequestId, this->last_update_result()->item_statuses[0].first);
+  EXPECT_EQ(ItemActionStatus::SUCCESS,
+            this->last_update_result()->item_statuses[0].second);
+  EXPECT_EQ(1UL, this->last_update_result()->updated_items.size());
+  EXPECT_EQ(paused_request1, this->last_update_result()->updated_items.at(0));
+
   this->ClearResults();
 
   // Get the request from the queue to check it out
   store->GetRequests(base::Bind(&RequestQueueStoreTestBase::GetRequestsDone,
                                 base::Unretained(this)));
   this->PumpLoop();
   ASSERT_EQ(LastResult::kTrue, this->last_result());
   // The request should still be in the queue.
   ASSERT_EQ(1UL, this->last_requests().size());
   // Request 1 should be paused.
-  ASSERT_EQ(SavePageRequest::RequestState::PAUSED,
-            this->last_requests().at(0)->request_state());
+  ASSERT_EQ(paused_request1, *(this->last_requests().at(0)));
   this->ClearResults();
 
   // Now resume the same request we paused.
   store->ChangeRequestsState(
       request_ids, SavePageRequest::RequestState::AVAILABLE,
-      base::Bind(&RequestQueueStoreTestBase::UpdateMultipleRequestsDone,
+      base::Bind(&RequestQueueStoreTestBase::UpdateRequestDone,
                  base::Unretained(this)));
-  ASSERT_EQ(LastResult::kNone, this->last_result());
+
+  ASSERT_FALSE(this->last_update_result());
   this->PumpLoop();
 
-  // Verify resume succeeded.
-  ASSERT_EQ(1ul, this->last_multiple_update_results().size());
-  ASSERT_EQ(RequestQueue::UpdateRequestResult::SUCCESS,
-            this->last_multiple_update_results().at(0).second);
-  ASSERT_EQ(kRequestId, this->last_requests().at(0)->request_id());
+  ASSERT_TRUE(this->last_update_result());
+  EXPECT_EQ(1UL, this->last_update_result()->item_statuses.size());
+  EXPECT_EQ(kRequestId, this->last_update_result()->item_statuses[0].first);
+  EXPECT_EQ(ItemActionStatus::SUCCESS,
+            this->last_update_result()->item_statuses[0].second);
+  EXPECT_EQ(1UL, this->last_update_result()->updated_items.size());
+  EXPECT_EQ(request1, this->last_update_result()->updated_items.at(0));
+
   this->ClearResults();
 
   // Get the request from the queue to check it out
   store->GetRequests(base::Bind(&RequestQueueStoreTestBase::GetRequestsDone,
                                 base::Unretained(this)));
   this->PumpLoop();
   ASSERT_EQ(LastResult::kTrue, this->last_result());
   // The request should still be in the queue.
   ASSERT_EQ(1UL, this->last_requests().size());
-  // Request 1 should be paused.
-  ASSERT_EQ(SavePageRequest::RequestState::AVAILABLE,
-            this->last_requests().at(0)->request_state());
-  this->ClearResults();
+  // Request 1 should be available.
+  ASSERT_EQ(request1, *(this->last_requests().at(0)));
 }
 
 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->AddRequest(original_request,
                     base::Bind(&RequestQueueStoreTestBase::AddRequestDone,
                                base::Unretained(this)));
@@ skipping 37 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().at(0).get()));
 }
 
 }  // offline_pages