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

components/offline_pages/offline_page_model_impl_unittest.cc

 // Copyright 2015 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.
 
 #include "components/offline_pages/offline_page_model_impl.h"
 
 #include <stdint.h>
 #include <algorithm>
 #include <utility>
 
@@ skipping 712 matching lines @@
 
   ResetResults();
 
   base::Optional<OfflinePageItem> page = GetPageByOfflineId(offline_id);
 
   // Delete the offline copy of the page and check the metadata.
   base::DeleteFile(page->file_path, false);
   model()->CheckForExternalFileDeletion();
   PumpLoop();
 
-  EXPECT_EQ(last_deleted_offline_id(), offline_id);
+  // Check if the page has been expired.
   EXPECT_EQ(0UL, GetAllPages().size());
 }
 
 TEST_F(OfflinePageModelImplTest, DetectThatOfflineCopyIsMissingAfterLoad) {
   // Save a page.
   SavePage(kTestUrl, kTestClientId1);
   PumpLoop();
   int64_t offline_id = last_save_offline_id();
 
   ResetResults();
 
   base::Optional<OfflinePageItem> page = GetPageByOfflineId(offline_id);
   // Delete the offline copy of the page and check the metadata.
   base::DeleteFile(page->file_path, false);
   // Reseting the model should trigger the metadata consistency check as well.
   ResetModel();
   PumpLoop();
 
-  EXPECT_EQ(last_deleted_offline_id(), offline_id);
+  // Check if the page has been expired.
   EXPECT_EQ(0UL, GetAllPages().size());
 }
 
+TEST_F(OfflinePageModelImplTest, DetectThatHeadlessPageIsDeleted) {
+  // Save a page.
+  SavePage(kTestUrl, kTestClientId1);
+  PumpLoop();
+  int64_t offline_id = last_save_offline_id();
+
+  ResetResults();
+  base::Optional<OfflinePageItem> page = GetPageByOfflineId(offline_id);
+  base::FilePath path = page->file_path;
+  EXPECT_TRUE(base::PathExists(path));

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

Could you also add this check before CheckForExternalFileDeletion?

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

Done.

+  GetStore()->ClearAllPages();
+  ResetModel();
+  PumpLoop();
+
+  model()->CheckForExternalFileDeletion();
+  PumpLoop();
+
+  EXPECT_EQ(0UL, GetAllPages().size());
+  EXPECT_FALSE(base::PathExists(path));
+}
+
 TEST_F(OfflinePageModelImplTest, DeleteMultiplePages) {
   OfflinePageTestStore* store = GetStore();
 
   // Save 3 pages.
   std::unique_ptr<OfflinePageTestArchiver> archiver(BuildArchiver(
       kTestUrl, OfflinePageArchiver::ArchiverResult::SUCCESSFULLY_CREATED));
   model()->SavePage(
       kTestUrl, kTestClientId1, std::move(archiver),
       base::Bind(&OfflinePageModelImplTest::OnSavePageDone, AsWeakPtr()));
   PumpLoop();
@@ skipping 287 matching lines @@
   std::unique_ptr<base::FeatureList> feature_list2(new base::FeatureList);
   feature_list2->InitializeFromCommandLine(
       std::string(offline_pages::kOfflineBookmarksFeature.name) + "," +
           offline_pages::kOfflinePagesBackgroundLoadingFeature.name,
       "");
   base::FeatureList::SetInstance(std::move(feature_list2));
   EXPECT_TRUE(offline_pages::IsOfflinePagesBackgroundLoadingEnabled());
 }
 
 }  // namespace offline_pages