| Index: components/offline_pages/core/offline_page_storage_manager_unittest.cc
|
| diff --git a/components/offline_pages/core/offline_page_storage_manager_unittest.cc b/components/offline_pages/core/offline_page_storage_manager_unittest.cc
|
| index 29dbced847b88715f5a8bce7167c73950270b666..db76ce0f61d4806b2cc5691f32c31d61231440b7 100644
|
| --- a/components/offline_pages/core/offline_page_storage_manager_unittest.cc
|
| +++ b/components/offline_pages/core/offline_page_storage_manager_unittest.cc
|
| @@ -19,13 +19,12 @@
|
| #include "components/offline_pages/core/offline_page_types.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| -using LifetimePolicy = offline_pages::LifetimePolicy;
|
| -using ClearStorageResult =
|
| - offline_pages::OfflinePageStorageManager::ClearStorageResult;
|
| -using StorageStats = offline_pages::ArchiveManager::StorageStats;
|
| -
|
| namespace offline_pages {
|
|
|
| +using LifetimeType = LifetimePolicy::LifetimeType;
|
| +using ClearStorageResult = OfflinePageStorageManager::ClearStorageResult;
|
| +using StorageStats = ArchiveManager::StorageStats;
|
| +
|
| namespace {
|
| const char kOneDayNamespace[] = "temporary_namespace_1day";
|
| const char kOneWeekNamespace[] = "temporary_namespace_7day";
|
| @@ -58,21 +57,19 @@ class OfflinePageTestModel : public OfflinePageModelImpl {
|
| options_(options),
|
| next_offline_id_(0) {
|
| policy_controller_->AddPolicyForTest(
|
| - kOneDayNamespace,
|
| - OfflinePageClientPolicyBuilder(kOneDayNamespace,
|
| - LifetimePolicy::LifetimeType::TEMPORARY,
|
| - kUnlimitedPages, kUnlimitedPages)
|
| - .SetExpirePeriod(base::TimeDelta::FromDays(1)));
|
| + kOneDayNamespace, OfflinePageClientPolicyBuilder(
|
| + kOneDayNamespace, LifetimeType::TEMPORARY,
|
| + kUnlimitedPages, kUnlimitedPages)
|
| + .SetExpirePeriod(base::TimeDelta::FromDays(1)));
|
| policy_controller_->AddPolicyForTest(
|
| kOneWeekNamespace,
|
| - OfflinePageClientPolicyBuilder(kOneWeekNamespace,
|
| - LifetimePolicy::LifetimeType::TEMPORARY,
|
| - kUnlimitedPages, 1)
|
| + OfflinePageClientPolicyBuilder(
|
| + kOneWeekNamespace, LifetimeType::TEMPORARY, kUnlimitedPages, 1)
|
| .SetExpirePeriod(base::TimeDelta::FromDays(7)));
|
| policy_controller_->AddPolicyForTest(
|
| kPersistentNamespace,
|
| OfflinePageClientPolicyBuilder(kPersistentNamespace,
|
| - LifetimePolicy::LifetimeType::PERSISTENT,
|
| + LifetimeType::PERSISTENT,
|
| kUnlimitedPages, kUnlimitedPages)
|
| .SetIsRemovedOnCacheReset(false));
|
| for (const auto& setting : page_settings)
|
| @@ -178,8 +175,9 @@ class TestArchiveManager : public ArchiveManager {
|
| public:
|
| explicit TestArchiveManager(StorageStats stats) : stats_(stats) {}
|
|
|
| - void GetStorageStats(const base::Callback<
|
| - void(const ArchiveManager::StorageStats& storage_stats)>&
|
| + void GetStorageStats(const std::set<LifetimeType>& types,
|
| + const base::Callback<void(
|
| + const ArchiveManager::StorageStats& storage_stats)>&
|
| callback) const override {
|
| callback.Run(stats_);
|
| }
|
|
|