| Index: components/offline_pages/background/request_coordinator.cc
|
| diff --git a/components/offline_pages/background/request_coordinator.cc b/components/offline_pages/background/request_coordinator.cc
|
| index 8aae54cfb739b5b3eadb46cd7abc254bd0ee4f1a..8fd451c6411b4a30138fa0b64bcef882bdbf3753 100644
|
| --- a/components/offline_pages/background/request_coordinator.cc
|
| +++ b/components/offline_pages/background/request_coordinator.cc
|
| @@ -314,18 +314,16 @@ void RequestCoordinator::UpdateMultipleRequestsCallback(
|
| void RequestCoordinator::HandleRemovedRequestsAndCallback(
|
| const RemoveRequestsCallback& callback,
|
| BackgroundSavePageResult status,
|
| - const RequestQueue::UpdateMultipleRequestResults& results,
|
| - std::vector<std::unique_ptr<SavePageRequest>> requests) {
|
| - callback.Run(results);
|
| - HandleRemovedRequests(status, results, std::move(requests));
|
| + std::unique_ptr<UpdateRequestsResult> result) {
|
| + callback.Run(result->item_statuses);
|
| + HandleRemovedRequests(status, std::move(result));
|
| }
|
|
|
| void RequestCoordinator::HandleRemovedRequests(
|
| BackgroundSavePageResult status,
|
| - const RequestQueue::UpdateMultipleRequestResults& results,
|
| - std::vector<std::unique_ptr<SavePageRequest>> requests) {
|
| - for (const auto& request : requests)
|
| - NotifyCompleted(*request, status);
|
| + std::unique_ptr<UpdateRequestsResult> result) {
|
| + for (const auto& request : result->updated_items)
|
| + NotifyCompleted(request, status);
|
| }
|
|
|
| void RequestCoordinator::ScheduleAsNeeded() {
|
| @@ -470,10 +468,6 @@ void RequestCoordinator::SendRequestToOffliner(const SavePageRequest& request) {
|
| base::Bind(&RequestCoordinator::UpdateRequestCallback,
|
| weak_ptr_factory_.GetWeakPtr(), updated_request.client_id()));
|
| active_request_.reset(new SavePageRequest(updated_request));
|
| - queue_->UpdateRequest(
|
| - updated_request,
|
| - base::Bind(&RequestCoordinator::UpdateRequestCallback,
|
| - weak_ptr_factory_.GetWeakPtr(), updated_request.client_id()));
|
|
|
| // Start the load and save process in the offliner (Async).
|
| if (offliner_->LoadAndSave(
|
|
|