[Offline Pages] Filtering expired pages and fix consistency check.

components/offline_pages/offline_page_model_impl.h

 // 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.
 
 #ifndef COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_IMPL_H_
 #define COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_IMPL_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 178 matching lines @@
                                 bool success);
   void InformDeletePageDone(const DeletePageCallback& callback,
                             DeletePageResult result);
 
   void OnMarkPageAccesseDone(const OfflinePageItem& offline_page_item,
                              bool success);
 
   // Callbacks for checking if offline pages are missing archive files.
   void ScanForMissingArchiveFiles(
       const std::set<base::FilePath>& archive_paths);
-  void OnRemoveOfflinePagesMissingArchiveFileDone(
-      const std::vector<std::pair<int64_t, ClientId>>& offline_client_id_pairs,
-      DeletePageResult result);
+  void OnDeleteHeadlessArchivesDone(const std::vector<base::FilePath>& archives,

[fgorski, 2016/06/07 22:46:15]

Please explain what "headless" means here and why you chose it. 

[romax, 2016/06/08 01:31:26]

added some explaination in comment..I'm choosing headless since i was always
considering page item and archive files like pointers and objects... page items
in metadata store are pointers and archives are objects...or linked list? I
think there's a similar term in linked list.
But TBH I'd like some suggestions for names. However I'd like to have some
'terms' for things we have here within our group which we know what they are
while they're not too long to write.

+                                    bool success);
+  void OnExpireArchivelessFilesDone(const std::vector<int64_t>& offline_ids,
+                                    bool success);
 
   // Steps for clearing all.
   void OnRemoveAllFilesDoneForClearAll(const base::Closure& callback,
                                        DeletePageResult result);
   void OnResetStoreDoneForClearAll(const base::Closure& callback, bool success);
   void OnReloadStoreDoneForClearAll(
       const base::Closure& callback,
       OfflinePageMetadataStore::LoadStatus load_status,
       const std::vector<OfflinePageItem>& offline_pages);
 
@@ skipping 54 matching lines @@
   std::unique_ptr<ArchiveManager> archive_manager_;
 
   base::WeakPtrFactory<OfflinePageModelImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OfflinePageModelImpl);
 };
 
 }  // namespace offline_pages
 
 #endif  // COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_IMPL_H_