[Offline pages] Detecting missing offline copy

components/offline_pages/offline_page_model_unittest.cc

Index: components/offline_pages/offline_page_model_unittest.cc
diff --git a/components/offline_pages/offline_page_model_unittest.cc b/components/offline_pages/offline_page_model_unittest.cc
index 864da9a5a4a308264271808b917e43fe7b3cc323..4342289bf58402824828fd7e06700c63dad9f939 100644
--- a/components/offline_pages/offline_page_model_unittest.cc
+++ b/components/offline_pages/offline_page_model_unittest.cc
@@ -173,6 +173,7 @@ class OfflinePageModelTest
   // OfflinePageModel::Observer implementation.
   void OfflinePageModelLoaded(OfflinePageModel* model) override;
   void OfflinePageModelChanged(OfflinePageModel* model) override;
+  void OfflinePageDeleted(int64 bookmark_id) override;
 
   // OfflinePageModel callbacks.
   void OnSavePageDone(SavePageResult result);
@@ -209,6 +210,10 @@ class OfflinePageModelTest
     return last_delete_result_;
   }
 
+  int64 last_deleted_bookmark_id() const {
+    return last_deleted_bookmark_id_;
+  }
+
   const base::FilePath& last_archiver_path() { return last_archiver_path_; }
   void set_last_archiver_path(const base::FilePath& last_archiver_path) {
     last_archiver_path_ = last_archiver_path;
@@ -223,6 +228,7 @@ class OfflinePageModelTest
   SavePageResult last_save_result_;
   DeletePageResult last_delete_result_;
   base::FilePath last_archiver_path_;
+  int64 last_deleted_bookmark_id_;
 };
 
 OfflinePageTestArchiver::OfflinePageTestArchiver(
@@ -263,7 +269,8 @@ void OfflinePageTestArchiver::CompleteCreateArchive() {
 
 OfflinePageModelTest::OfflinePageModelTest()
     : last_save_result_(SavePageResult::CANCELLED),
-      last_delete_result_(DeletePageResult::CANCELLED) {
+      last_delete_result_(DeletePageResult::CANCELLED),
+      last_deleted_bookmark_id_(-1) {
 }
 
 OfflinePageModelTest::~OfflinePageModelTest() {
@@ -278,6 +285,8 @@ void OfflinePageModelTest::SetUp() {
 
 void OfflinePageModelTest::TearDown() {
   model_->RemoveObserver(this);
+  run_loop_.reset(new base::RunLoop());
+  run_loop_->RunUntilIdle();

[jianli, 2015/10/20 21:56:49]

Will base::RunLoop().RunUntilIdle() work?

[fgorski, 2015/10/21 20:01:33]

Done.

 }
 
 void OfflinePageModelTest::OfflinePageModelLoaded(OfflinePageModel* model) {
@@ -289,6 +298,11 @@ void OfflinePageModelTest::OfflinePageModelChanged(OfflinePageModel* model) {
   ASSERT_EQ(model_.get(), model);
 }
 
+void OfflinePageModelTest::OfflinePageDeleted(int64 bookmark_id) {
+  last_deleted_bookmark_id_ = bookmark_id;
+  run_loop_->Quit();
+}
+
 void OfflinePageModelTest::OnSavePageDone(
     OfflinePageModel::SavePageResult result) {
   run_loop_->Quit();
@@ -674,6 +688,55 @@ TEST_F(OfflinePageModelTest, DeletePageStoreFailureOnRemove) {
   EXPECT_EQ(DeletePageResult::STORE_FAILURE, last_delete_result());
 }
 
+TEST_F(OfflinePageModelTest, DetectThatOfflineCopyIsMissing) {
+  // Save a page.
+  scoped_ptr<OfflinePageTestArchiver> archiver(
+      BuildArchiver(kTestUrl,
+                    OfflinePageArchiver::ArchiverResult::SUCCESSFULLY_CREATED)
+          .Pass());
+  model()->SavePage(
+      kTestUrl, kTestPageBookmarkId1, archiver.Pass(),
+      base::Bind(&OfflinePageModelTest::OnSavePageDone, AsWeakPtr()));
+  PumpLoop();
+
+  ResetResults();
+
+  const OfflinePageItem* page =
+      model()->GetPageByBookmarkId(kTestPageBookmarkId1);
+  // Delete the offline copy of the page and check the metadata.
+  base::DeleteFile(page->file_path, false);
+  model()->CheckForExternalFileDeletion();
+  PumpLoop();
+
+  EXPECT_EQ(last_deleted_bookmark_id(), kTestPageBookmarkId1);
+  EXPECT_EQ(0UL, model()->GetAllPages().size());
+}
+
+TEST_F(OfflinePageModelTest, DetectThatOfflineCopyIsMissingAfterLoad) {
+  // Save a page.
+  scoped_ptr<OfflinePageTestArchiver> archiver(
+      BuildArchiver(kTestUrl,
+                    OfflinePageArchiver::ArchiverResult::SUCCESSFULLY_CREATED)
+          .Pass());
+  model()->SavePage(
+      kTestUrl, kTestPageBookmarkId1, archiver.Pass(),
+      base::Bind(&OfflinePageModelTest::OnSavePageDone, AsWeakPtr()));
+  PumpLoop();
+
+  ResetResults();
+
+  const OfflinePageItem* page =
+      model()->GetPageByBookmarkId(kTestPageBookmarkId1);
+  // 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_bookmark_id(), kTestPageBookmarkId1);
+  EXPECT_EQ(0UL, model()->GetAllPages().size());
+}
+
 TEST_F(OfflinePageModelTest, GetPageByBookmarkId) {
   scoped_ptr<OfflinePageTestArchiver> archiver(
       BuildArchiver(kTestUrl,