| 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 fd89194257ff7256bbca98d6e7856726e6912994..283216a4896f48c693f4b41a5b1c9d6771efe292 100644
|
| --- a/components/offline_pages/offline_page_metadata_store_impl_unittest.cc
|
| +++ b/components/offline_pages/offline_page_metadata_store_impl_unittest.cc
|
| @@ -231,7 +231,7 @@ class OfflinePageMetadataStoreTest : public testing::Test {
|
| void PumpLoop();
|
|
|
| void GetOfflinePagesCallback(
|
| - OfflinePageMetadataStore::LoadStatus load_status,
|
| + StoreState store_state,
|
| const std::vector<OfflinePageItem>& offline_pages);
|
| void AddCallback(ItemActionStatus status);
|
| void UpdateCallback(CalledCallback called_callback,
|
| @@ -275,11 +275,10 @@ void OfflinePageMetadataStoreTest::PumpLoop() {
|
| }
|
|
|
| void OfflinePageMetadataStoreTest::GetOfflinePagesCallback(
|
| - OfflinePageMetadataStore::LoadStatus load_status,
|
| + StoreState store_state,
|
| const std::vector<OfflinePageItem>& offline_pages) {
|
| last_called_callback_ = LOAD;
|
| - last_status_ = load_status == OfflinePageMetadataStore::LOAD_SUCCEEDED ?
|
| - STATUS_TRUE : STATUS_FALSE;
|
| + last_status_ = store_state == StoreState::LOADED ? STATUS_TRUE : STATUS_FALSE;
|
| offline_pages_.swap(const_cast<std::vector<OfflinePageItem>&>(offline_pages));
|
| }
|
|
|
| @@ -440,15 +439,6 @@ TEST_F(OfflinePageMetadataStoreTest, GetOfflinePagesFromInvalidStore) {
|
| EXPECT_EQ(0UL, offline_pages_.size());
|
| EXPECT_EQ(STATUS_FALSE, last_status_);
|
|
|
| - sql_store->SetStateForTesting(StoreState::LOADED, true);
|
| - store->GetOfflinePages(
|
| - base::Bind(&OfflinePageMetadataStoreTest::GetOfflinePagesCallback,
|
| - base::Unretained(this)));
|
| - PumpLoop();
|
| - EXPECT_EQ(LOAD, last_called_callback_);
|
| - EXPECT_EQ(0UL, offline_pages_.size());
|
| - EXPECT_EQ(STATUS_FALSE, last_status_);
|
| -
|
| sql_store->SetStateForTesting(StoreState::NOT_LOADED, true);
|
| store->GetOfflinePages(
|
| base::Bind(&OfflinePageMetadataStoreTest::GetOfflinePagesCallback,
|
| @@ -475,7 +465,6 @@ TEST_F(OfflinePageMetadataStoreTest, GetOfflinePagesFromInvalidStore) {
|
| EXPECT_EQ(LOAD, last_called_callback_);
|
| EXPECT_EQ(0UL, offline_pages_.size());
|
| EXPECT_EQ(STATUS_FALSE, last_status_);
|
| -
|
| }
|
|
|
| // Loads a store which has an outdated schema.
|
|
|