| 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 253dc67da9e427671da31095bbe886f1f17cad82..2feb2f58d9aa8fadfbc6509f278e2f0b90b26b40 100644
|
| --- a/components/offline_pages/offline_page_model_unittest.cc
|
| +++ b/components/offline_pages/offline_page_model_unittest.cc
|
| @@ -99,6 +99,12 @@ class OfflinePageModelTest
|
| int64_t bookmark_id,
|
| OfflinePageArchiver::ArchiverResult result);
|
|
|
| + void DeletePage(int64_t bookmark_id,
|
| + const OfflinePageModel::DeletePageCallback& callback) {
|
| + model()->DeletePagesByBookmarkId(std::vector<int64_t>(1, bookmark_id),
|
| + callback);
|
| + }
|
| +
|
| OfflinePageModel* model() { return model_.get(); }
|
|
|
| SavePageResult last_save_result() const {
|
| @@ -488,9 +494,8 @@ TEST_F(OfflinePageModelTest, DeletePageSuccessful) {
|
| ResetResults();
|
|
|
| // Delete one page.
|
| - model()->DeletePageByBookmarkId(
|
| - kTestPageBookmarkId1, base::Bind(&OfflinePageModelTest::OnDeletePageDone,
|
| - AsWeakPtr()));
|
| + DeletePage(kTestPageBookmarkId1,
|
| + base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
|
|
|
| PumpLoop();
|
|
|
| @@ -500,9 +505,8 @@ TEST_F(OfflinePageModelTest, DeletePageSuccessful) {
|
| EXPECT_EQ(kTestUrl2, store->GetAllPages()[0].url);
|
|
|
| // Delete another page.
|
| - model()->DeletePageByBookmarkId(
|
| - kTestPageBookmarkId2, base::Bind(&OfflinePageModelTest::OnDeletePageDone,
|
| - AsWeakPtr()));
|
| + DeletePage(kTestPageBookmarkId2,
|
| + base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
|
|
|
| ResetResults();
|
|
|
| @@ -514,9 +518,8 @@ TEST_F(OfflinePageModelTest, DeletePageSuccessful) {
|
| }
|
|
|
| TEST_F(OfflinePageModelTest, DeletePageNotFound) {
|
| - model()->DeletePageByBookmarkId(
|
| - kTestPageBookmarkId1, base::Bind(&OfflinePageModelTest::OnDeletePageDone,
|
| - AsWeakPtr()));
|
| + DeletePage(kTestPageBookmarkId1,
|
| + base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
|
| EXPECT_EQ(DeletePageResult::NOT_FOUND, last_delete_result());
|
| }
|
|
|
| @@ -529,9 +532,8 @@ TEST_F(OfflinePageModelTest, DeletePageStoreFailureOnRemove) {
|
| // Try to delete this page.
|
| GetStore()->set_test_scenario(
|
| OfflinePageTestStore::TestScenario::REMOVE_FAILED);
|
| - model()->DeletePageByBookmarkId(
|
| - kTestPageBookmarkId1, base::Bind(&OfflinePageModelTest::OnDeletePageDone,
|
| - AsWeakPtr()));
|
| + DeletePage(kTestPageBookmarkId1,
|
| + base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
|
| PumpLoop();
|
| EXPECT_EQ(DeletePageResult::STORE_FAILURE, last_delete_result());
|
| }
|
|
|