| Index: components/offline_pages/offline_page_metadata_store_impl_unittest.cc
|
| diff --git a/components/offline_pages/offline_page_metadata_store_impl_unittest.cc b/components/offline_pages/offline_page_metadata_store_impl_unittest.cc
|
| index c02e96d73eec635c4da99b56a7bca3f30d342428..628a9b89af9b7b3d6566ab7cf743e3ec7bc5109a 100644
|
| --- a/components/offline_pages/offline_page_metadata_store_impl_unittest.cc
|
| +++ b/components/offline_pages/offline_page_metadata_store_impl_unittest.cc
|
| @@ -233,8 +233,10 @@ class OfflinePageMetadataStoreTest : public testing::Test {
|
| void GetOfflinePagesCallback(
|
| OfflinePageMetadataStore::LoadStatus load_status,
|
| const std::vector<OfflinePageItem>& offline_pages);
|
| - void AddCallback(OfflinePageMetadataStore::ItemActionStatus status);
|
| - void UpdateCallback(CalledCallback called_callback, bool success);
|
| + void AddCallback(ItemActionStatus status);
|
| + void UpdateCallback(CalledCallback called_callback,
|
| + std::unique_ptr<StoreUpdateResult> result);
|
| + void ResetCallback(bool status);
|
|
|
| void ClearResults();
|
|
|
| @@ -276,19 +278,23 @@ void OfflinePageMetadataStoreTest::GetOfflinePagesCallback(
|
| offline_pages_.swap(const_cast<std::vector<OfflinePageItem>&>(offline_pages));
|
| }
|
|
|
| -void OfflinePageMetadataStoreTest::AddCallback(
|
| - OfflinePageMetadataStore::ItemActionStatus status) {
|
| +void OfflinePageMetadataStoreTest::AddCallback(ItemActionStatus status) {
|
| last_called_callback_ = ADD;
|
| // TODO(fgorski): Add specific add status.
|
| // last_item_status_ = status;
|
| last_status_ =
|
| - status == OfflinePageMetadataStore::SUCCESS ? STATUS_TRUE : STATUS_FALSE;
|
| + status == ItemActionStatus::SUCCESS ? STATUS_TRUE : STATUS_FALSE;
|
| }
|
|
|
| void OfflinePageMetadataStoreTest::UpdateCallback(
|
| CalledCallback called_callback,
|
| - bool status) {
|
| + std::unique_ptr<StoreUpdateResult> result) {
|
| last_called_callback_ = called_callback;
|
| + last_status_ = result->updated_items.size() > 0 ? STATUS_TRUE : STATUS_FALSE;
|
| +}
|
| +
|
| +void OfflinePageMetadataStoreTest::ResetCallback(bool status) {
|
| + last_called_callback_ = RESET;
|
| last_status_ = status ? STATUS_TRUE : STATUS_FALSE;
|
| }
|
|
|
| @@ -707,8 +713,8 @@ TEST_F(OfflinePageMetadataStoreTest, ClearAllOfflinePages) {
|
| EXPECT_EQ(2U, offline_pages_.size());
|
|
|
| // Clear all records from the store.
|
| - store->Reset(base::Bind(&OfflinePageMetadataStoreTest::UpdateCallback,
|
| - base::Unretained(this), RESET));
|
| + store->Reset(base::Bind(&OfflinePageMetadataStoreTest::ResetCallback,
|
| + base::Unretained(this)));
|
| PumpLoop();
|
| EXPECT_EQ(RESET, last_called_callback_);
|
| EXPECT_EQ(STATUS_TRUE, last_status_);
|
|
|