Since we have the interceptor now, 2-step deletion (expiration) is not needed anymore, we can simply call DeleteOfflinePages instead of expiring the pages first.
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac commit cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac Author: romax <romax@chromium.org> Date: Wed Nov 30 19:45:58 2016 [Offline Pages] Removes two-step expiration related. Removed the two-step expiration related code from offline pages. Also fixed the tests related. Now the pages which live longer than the time specified in policy would be deleted from both metadata store and disk. BUG= 661721 Review-Url: https://codereview.chromium.org/2512073002 Cr-Commit-Position: refs/heads/master@{#435381} [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/chrome/browser/android/offline_pages/offline_page_bookmark_observer.cc [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/chrome/browser/android/offline_pages/offline_page_bookmark_observer.h [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/chrome/browser/android/offline_pages/offline_page_utils_unittest.cc [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/chrome/browser/ui/webui/offline/offline_internals_ui_message_handler.cc [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/components/offline_pages/downloads/download_ui_adapter.cc [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/components/offline_pages/offline_page_item.cc [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/components/offline_pages/offline_page_item.h [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/components/offline_pages/offline_page_metadata_store_impl_unittest.cc [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/components/offline_pages/offline_page_metadata_store_sql.cc [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/components/offline_pages/offline_page_metadata_store_sql.h [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/components/offline_pages/offline_page_model.h [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/components/offline_pages/offline_page_model_impl.cc [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/components/offline_pages/offline_page_model_impl.h [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/components/offline_pages/offline_page_model_impl_unittest.cc [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/components/offline_pages/offline_page_model_query.cc [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/components/offline_pages/offline_page_model_query.h [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/components/offline_pages/offline_page_model_query_unittest.cc [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/components/offline_pages/offline_page_storage_manager.cc [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/components/offline_pages/offline_page_storage_manager.h [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/components/offline_pages/offline_page_storage_manager_unittest.cc [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/components/offline_pages/stub_offline_page_model.cc [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/components/offline_pages/stub_offline_page_model.h [modify] https://crrev.com/cb27e63bd49fc1069fa4bbcf06ab6b50fd6d71ac/tools/metrics/histograms/histograms.xml
Comment 1 by romax@chromium.org
, Nov 14 2016