Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(262)

Unified Diff: components/offline_pages/offline_page_model_unittest.cc

Issue 1739503002: Makes the OfflinePageBridge.getAllPages method asynchronous. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Wait for model load in new async method. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 5c9e934c0e0886a528cf9729773aea53c6ec939c..bc3d22fa704ef104ccfb1c7dd2e87ff7ffa8cb04 100644
--- a/components/offline_pages/offline_page_model_unittest.cc
+++ b/components/offline_pages/offline_page_model_unittest.cc
@@ -106,6 +106,13 @@ class OfflinePageModelTest
ClientId client_id,
OfflinePageArchiver::ArchiverResult result);
+ void DeletePage(int64_t bookmark_id,
+ const OfflinePageModel::DeletePageCallback& callback) {
+ std::vector<int64_t> bookmark_ids;
fgorski 2016/03/28 17:58:46 offline_ids ?
dewittj 2016/03/31 18:43:18 Done.
+ bookmark_ids.push_back(bookmark_id);
+ model()->DeletePagesByOfflineId(bookmark_ids, callback);
+ }
+
OfflinePageModel* model() { return model_.get(); }
int64_t last_save_offline_id() const { return last_save_offline_id_; }
@@ -522,9 +529,8 @@ TEST_F(OfflinePageModelTest, DeletePageSuccessful) {
ResetResults();
// Delete one page.
- model()->DeletePageByOfflineId(
- offline1,
- base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
+ DeletePage(offline1,
+ base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
PumpLoop();
@@ -535,9 +541,8 @@ TEST_F(OfflinePageModelTest, DeletePageSuccessful) {
EXPECT_EQ(kTestUrl2, store->GetAllPages()[0].url);
// Delete another page.
- model()->DeletePageByOfflineId(
- offline2,
- base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
+ DeletePage(offline2,
+ base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
ResetResults();
@@ -550,8 +555,8 @@ TEST_F(OfflinePageModelTest, DeletePageSuccessful) {
}
TEST_F(OfflinePageModelTest, DeletePageNotFound) {
- model()->DeletePageByOfflineId(
- 1234LL, base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
+ DeletePage(1234LL,
+ base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
EXPECT_EQ(DeletePageResult::NOT_FOUND, last_delete_result());
}
@@ -564,9 +569,8 @@ TEST_F(OfflinePageModelTest, DeletePageStoreFailureOnRemove) {
// Try to delete this page.
GetStore()->set_test_scenario(
OfflinePageTestStore::TestScenario::REMOVE_FAILED);
- model()->DeletePageByOfflineId(
- offline_id,
- base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
+ DeletePage(offline_id,
+ base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
PumpLoop();
EXPECT_EQ(DeletePageResult::STORE_FAILURE, last_delete_result());
}

Powered by Google App Engine
This is Rietveld 408576698