[Offline pages] Removing RequestQueueStore::UpdateMultipleRequestsCallback

components/offline_pages/background/request_queue_store_unittest.cc

Index: components/offline_pages/background/request_queue_store_unittest.cc
diff --git a/components/offline_pages/background/request_queue_store_unittest.cc b/components/offline_pages/background/request_queue_store_unittest.cc
index cfe0bf39e8eadf6839c2b4da9dd96197144ec49f..e3cd532d9e6820356e36a9f715c15b9050522902 100644
--- a/components/offline_pages/background/request_queue_store_unittest.cc
+++ b/components/offline_pages/background/request_queue_store_unittest.cc
@@ -395,16 +395,24 @@ TYPED_TEST(RequestQueueStoreTest, PauseAndResumeRequest) {
   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
@@ -415,23 +423,26 @@ TYPED_TEST(RequestQueueStoreTest, PauseAndResumeRequest) {
   // 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
@@ -441,10 +452,8 @@ TYPED_TEST(RequestQueueStoreTest, PauseAndResumeRequest) {
   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) {