| 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 64adf44fef9ed1b66217cae6beca791a92fd1a84..a11b07fe3bae8cccfbcd34742a70733e76d542e8 100644
|
| --- a/components/offline_pages/offline_page_model_unittest.cc
|
| +++ b/components/offline_pages/offline_page_model_unittest.cc
|
| @@ -468,92 +468,6 @@ TEST_F(OfflinePageModelTest, MarkPageAccessed) {
|
| EXPECT_EQ(1, offline_pages[0].access_count);
|
| }
|
|
|
| -TEST_F(OfflinePageModelTest, MarkPageForDeletion) {
|
| - SavePage(kTestUrl, kTestClientId1);
|
| -
|
| - GURL offline_url = GetAllPages().begin()->GetOfflineURL();
|
| -
|
| - // Delete the page with undo tiggerred.
|
| - model()->MarkPageForDeletion(
|
| - last_save_offline_id(),
|
| - base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
|
| - PumpLoop();
|
| -
|
| - // GetAllPages will not return the page that is marked for deletion.
|
| - const std::vector<OfflinePageItem>& offline_pages = GetAllPages();
|
| - EXPECT_EQ(0UL, offline_pages.size());
|
| -
|
| - EXPECT_FALSE(HasPages(kTestClientNamespace));
|
| - EXPECT_EQ(nullptr, model()->GetPageByOnlineURL(kTestUrl));
|
| - EXPECT_EQ(nullptr, model()->GetPageByOfflineId(last_save_offline_id()));
|
| - EXPECT_EQ(nullptr, model()->GetPageByOfflineURL(offline_url));
|
| -
|
| - // Undo the deletion.
|
| - model()->UndoPageDeletion(last_save_offline_id());
|
| - PumpLoop();
|
| -
|
| - // GetAllPages will now return the restored page.
|
| - const std::vector<OfflinePageItem>& offline_pages_after_undo = GetAllPages();
|
| - EXPECT_EQ(1UL, offline_pages_after_undo.size());
|
| -}
|
| -
|
| -TEST_F(OfflinePageModelTest, FinalizePageDeletion) {
|
| - scoped_ptr<OfflinePageTestArchiver> archiver(BuildArchiver(
|
| - kTestUrl, OfflinePageArchiver::ArchiverResult::SUCCESSFULLY_CREATED));
|
| - model()->SavePage(
|
| - kTestUrl, kTestClientId1, std::move(archiver),
|
| - base::Bind(&OfflinePageModelTest::OnSavePageDone, AsWeakPtr()));
|
| - PumpLoop();
|
| -
|
| - // Mark the page for deletion.
|
| - model()->MarkPageForDeletion(
|
| - last_save_offline_id(),
|
| - base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
|
| - PumpLoop();
|
| -
|
| - EXPECT_EQ(1UL, GetStore()->GetAllPages().size());
|
| -
|
| - // Fast forward to trigger the page deletion.
|
| - FastForwardBy(OfflinePageModel::GetFinalDeletionDelayForTesting());
|
| -
|
| - EXPECT_EQ(0UL, GetStore()->GetAllPages().size());
|
| -}
|
| -
|
| -TEST_F(OfflinePageModelTest, SavePageAfterMarkingPageForDeletion) {
|
| - scoped_ptr<OfflinePageTestArchiver> archiver(BuildArchiver(
|
| - kTestUrl, OfflinePageArchiver::ArchiverResult::SUCCESSFULLY_CREATED));
|
| - model()->SavePage(
|
| - kTestUrl, kTestClientId1, std::move(archiver),
|
| - base::Bind(&OfflinePageModelTest::OnSavePageDone, AsWeakPtr()));
|
| - PumpLoop();
|
| -
|
| - // Mark the page for deletion.
|
| - model()->MarkPageForDeletion(
|
| - last_save_offline_id(),
|
| - base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
|
| - PumpLoop();
|
| -
|
| - EXPECT_EQ(1UL, GetStore()->GetAllPages().size());
|
| -
|
| - // Re-save the same page.
|
| - scoped_ptr<OfflinePageTestArchiver> archiver2(BuildArchiver(
|
| - kTestUrl, OfflinePageArchiver::ArchiverResult::SUCCESSFULLY_CREATED));
|
| - model()->SavePage(
|
| - kTestUrl, kTestClientId1, std::move(archiver2),
|
| - base::Bind(&OfflinePageModelTest::OnSavePageDone, AsWeakPtr()));
|
| -
|
| - // Fast forward to trigger the page cleanup.
|
| - FastForwardBy(OfflinePageModel::GetFinalDeletionDelayForTesting());
|
| -
|
| - // The re-saved page should still exist.
|
| - const std::vector<OfflinePageItem>& offline_pages = GetAllPages();
|
| - ASSERT_EQ(1UL, offline_pages.size());
|
| - EXPECT_EQ(kTestUrl, offline_pages[0].url);
|
| - EXPECT_EQ(kTestClientId1, offline_pages[0].client_id);
|
| - EXPECT_EQ(kTestFileSize, offline_pages[0].file_size);
|
| - EXPECT_EQ(0, offline_pages[0].access_count);
|
| -}
|
| -
|
| TEST_F(OfflinePageModelTest, GetAllPagesStoreEmpty) {
|
| const std::vector<OfflinePageItem>& offline_pages = GetAllPages();
|
|
|
|
|