Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6074)

Unified Diff: components/offline_pages/offline_page_model_impl.cc

Issue 2086733002: [Offline Pages] Fix cases where returning NOT_FOUND when deleting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix comments. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/offline_pages/offline_page_model_impl.cc
diff --git a/components/offline_pages/offline_page_model_impl.cc b/components/offline_pages/offline_page_model_impl.cc
index 4d6f1d7af3939455a3ab139c1001cfda815afc1a..d570c4a0c53078cd9f1a48a2471325f77bcca0f2 100644
--- a/components/offline_pages/offline_page_model_impl.cc
+++ b/components/offline_pages/offline_page_model_impl.cc
@@ -349,8 +349,9 @@ void OfflinePageModelImpl::DoDeletePagesByOfflineId(
}
}
+ // If there're no pages to delete, return early.
if (paths_to_delete.empty()) {
- InformDeletePageDone(callback, DeletePageResult::NOT_FOUND);
+ InformDeletePageDone(callback, DeletePageResult::SUCCESS);
return;
}
@@ -831,8 +832,6 @@ void OfflinePageModelImpl::OnRemoveOfflinePagesDone(
bool success) {
ReportPageHistogramsAfterDelete(offline_pages_, offline_ids);
- // Delete the offline page from the in memory cache regardless of success in
- // store.
for (int64_t offline_id : offline_ids) {
auto iter = offline_pages_.find(offline_id);
if (iter == offline_pages_.end())
@@ -842,6 +841,7 @@ void OfflinePageModelImpl::OnRemoveOfflinePagesDone(
OfflinePageDeleted(iter->second.offline_id, iter->second.client_id));
offline_pages_.erase(iter);
}
+
// Deleting multiple pages always succeeds when it gets to this point.
InformDeletePageDone(callback, (success || offline_ids.size() > 1)
? DeletePageResult::SUCCESS
« no previous file with comments | « components/offline_pages/offline_page_model.h ('k') | components/offline_pages/offline_page_model_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698