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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/quota/quota_manager_unittest.cc

Issue 1343273003: Integrate SiteEngagementEvictionPolicy with QuotaManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@add_eviction_policy
Patch Set: address comments Created 5 years, 2 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
« no previous file with comments | « chrome/browser/engagement/site_engagement_eviction_policy_unittest.cc ('k') | content/browser/quota/quota_temporary_storage_evictor_unittest.cc » ('j') | storage/browser/quota/quota_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/quota/quota_manager_unittest.cc
diff --git a/content/browser/quota/quota_manager_unittest.cc b/content/browser/quota/quota_manager_unittest.cc
index 39c2315689fa99b2f26c2276e7cbf13fba7730e8..6073a18cc4f4f876b06541518a23bea8c6fc6bbf 100644
--- a/content/browser/quota/quota_manager_unittest.cc
+++ b/content/browser/quota/quota_manager_unittest.cc
@@ -63,6 +63,21 @@ int64 GetAvailableDiskSpaceForTest(const base::FilePath&) {
return kAvailableSpaceForApp + kMinimumPreserveForSystem;
}
+class TestEvictionPolicy : public storage::QuotaEvictionPolicy {
+ public:
+ TestEvictionPolicy() {}
+ ~TestEvictionPolicy() override {}
+
+ // Overridden from storage::QuotaEvictionPolicy:
+ void GetEvictionOrigin(const scoped_refptr<storage::SpecialStoragePolicy>&
+ special_storage_policy,
+ const std::map<GURL, int64>& usage_map,
+ int64 global_quota,
+ const storage::GetOriginCallback& callback) override {
+ callback.Run(GURL("http://bar.com/"));
michaeln 2015/10/13 20:13:39 maybe make the test check for an explicit value re
calamity 2015/10/14 04:49:15 Done.
+ }
+};
+
} // namespace
class QuotaManagerTest : public testing::Test {
@@ -277,12 +292,13 @@ class QuotaManagerTest : public testing::Test {
quota_manager_->DeleteOriginFromDatabase(origin, type);
}
- void GetLRUOrigin(StorageType type) {
- lru_origin_ = GURL();
- quota_manager_->GetLRUOrigin(
- type,
- base::Bind(&QuotaManagerTest::DidGetLRUOrigin,
- weak_factory_.GetWeakPtr()));
+ void GetEvictionOrigin(StorageType type) {
+ eviction_origin_ = GURL();
+ // The quota manager's default eviction policy is to use an LRU eviction
+ // policy.
+ quota_manager_->GetEvictionOrigin(
+ type, 0, base::Bind(&QuotaManagerTest::DidGetEvictionOrigin,
+ weak_factory_.GetWeakPtr()));
}
void NotifyOriginInUse(const GURL& origin) {
@@ -366,8 +382,8 @@ class QuotaManagerTest : public testing::Test {
available_space_ = usage_and_quota.available_disk_space;
}
- void DidGetLRUOrigin(const GURL& origin) {
- lru_origin_ = origin;
+ void DidGetEvictionOrigin(const GURL& origin) {
+ eviction_origin_ = origin;
}
void DidGetModifiedOrigins(const std::set<GURL>& origins, StorageType type) {
@@ -408,7 +424,7 @@ class QuotaManagerTest : public testing::Test {
int64 unlimited_usage() const { return unlimited_usage_; }
int64 quota() const { return quota_; }
int64 available_space() const { return available_space_; }
- const GURL& lru_origin() const { return lru_origin_; }
+ const GURL& eviction_origin() const { return eviction_origin_; }
const std::set<GURL>& modified_origins() const { return modified_origins_; }
StorageType modified_origins_type() const { return modified_origins_type_; }
const QuotaTableEntries& quota_entries() const { return quota_entries_; }
@@ -438,7 +454,7 @@ class QuotaManagerTest : public testing::Test {
int64 unlimited_usage_;
int64 quota_;
int64 available_space_;
- GURL lru_origin_;
+ GURL eviction_origin_;
std::set<GURL> modified_origins_;
StorageType modified_origins_type_;
QuotaTableEntries quota_entries_;
@@ -1263,6 +1279,19 @@ TEST_F(QuotaManagerTest, GetAvailableSpaceTest) {
EXPECT_LE(0, available_space());
}
+TEST_F(QuotaManagerTest, SetTemporaryStorageEvictionPolicy) {
+ GetEvictionOrigin(kTemp);
+ base::RunLoop().RunUntilIdle();
+ EXPECT_TRUE(eviction_origin().is_empty());
michaeln 2015/10/13 20:13:39 maybe no need to test this case if the unambiguous
calamity 2015/10/14 04:49:15 Done.
+
+ quota_manager()->SetTemporaryStorageEvictionPolicy(
+ make_scoped_ptr(new TestEvictionPolicy));
+
+ GetEvictionOrigin(kTemp);
+ base::RunLoop().RunUntilIdle();
+ EXPECT_FALSE(eviction_origin().is_empty());
+}
+
TEST_F(QuotaManagerTest, EvictOriginData) {
static const MockOriginData kData1[] = {
{ "http://foo.com/", kTemp, 1 },
@@ -1387,19 +1416,19 @@ TEST_F(QuotaManagerTest, EvictOriginDataWithDeletionError) {
EXPECT_TRUE(found_origin_in_database);
for (size_t i = 0; i < kNumberOfTemporaryOrigins - 1; ++i) {
- GetLRUOrigin(kTemp);
+ GetEvictionOrigin(kTemp);
base::RunLoop().RunUntilIdle();
- EXPECT_FALSE(lru_origin().is_empty());
+ EXPECT_FALSE(eviction_origin().is_empty());
// The origin "http://foo.com/" should not be in the LRU list.
- EXPECT_NE(std::string("http://foo.com/"), lru_origin().spec());
- DeleteOriginFromDatabase(lru_origin(), kTemp);
+ EXPECT_NE(std::string("http://foo.com/"), eviction_origin().spec());
+ DeleteOriginFromDatabase(eviction_origin(), kTemp);
base::RunLoop().RunUntilIdle();
}
// Now the LRU list must be empty.
- GetLRUOrigin(kTemp);
+ GetEvictionOrigin(kTemp);
base::RunLoop().RunUntilIdle();
- EXPECT_TRUE(lru_origin().is_empty());
+ EXPECT_TRUE(eviction_origin().is_empty());
// Deleting origins from the database should not affect the results of the
// following checks.
@@ -1728,31 +1757,31 @@ TEST_F(QuotaManagerTest, NotifyAndLRUOrigin) {
RegisterClient(client);
GURL origin;
- GetLRUOrigin(kTemp);
+ GetEvictionOrigin(kTemp);
base::RunLoop().RunUntilIdle();
- EXPECT_TRUE(lru_origin().is_empty());
+ EXPECT_TRUE(eviction_origin().is_empty());
NotifyStorageAccessed(client, GURL("http://a.com/"), kTemp);
- GetLRUOrigin(kTemp);
+ GetEvictionOrigin(kTemp);
base::RunLoop().RunUntilIdle();
- EXPECT_EQ("http://a.com/", lru_origin().spec());
+ EXPECT_EQ("http://a.com/", eviction_origin().spec());
NotifyStorageAccessed(client, GURL("http://b.com/"), kPerm);
NotifyStorageAccessed(client, GURL("https://a.com/"), kTemp);
NotifyStorageAccessed(client, GURL("http://c.com/"), kTemp);
- GetLRUOrigin(kTemp);
+ GetEvictionOrigin(kTemp);
base::RunLoop().RunUntilIdle();
- EXPECT_EQ("http://a.com/", lru_origin().spec());
+ EXPECT_EQ("http://a.com/", eviction_origin().spec());
- DeleteOriginFromDatabase(lru_origin(), kTemp);
- GetLRUOrigin(kTemp);
+ DeleteOriginFromDatabase(eviction_origin(), kTemp);
+ GetEvictionOrigin(kTemp);
base::RunLoop().RunUntilIdle();
- EXPECT_EQ("https://a.com/", lru_origin().spec());
+ EXPECT_EQ("https://a.com/", eviction_origin().spec());
- DeleteOriginFromDatabase(lru_origin(), kTemp);
- GetLRUOrigin(kTemp);
+ DeleteOriginFromDatabase(eviction_origin(), kTemp);
+ GetEvictionOrigin(kTemp);
base::RunLoop().RunUntilIdle();
- EXPECT_EQ("http://c.com/", lru_origin().spec());
+ EXPECT_EQ("http://c.com/", eviction_origin().spec());
}
TEST_F(QuotaManagerTest, GetLRUOriginWithOriginInUse) {
@@ -1768,46 +1797,46 @@ TEST_F(QuotaManagerTest, GetLRUOriginWithOriginInUse) {
RegisterClient(client);
GURL origin;
- GetLRUOrigin(kTemp);
+ GetEvictionOrigin(kTemp);
base::RunLoop().RunUntilIdle();
- EXPECT_TRUE(lru_origin().is_empty());
+ EXPECT_TRUE(eviction_origin().is_empty());
NotifyStorageAccessed(client, GURL("http://a.com/"), kTemp);
NotifyStorageAccessed(client, GURL("http://b.com/"), kPerm);
NotifyStorageAccessed(client, GURL("https://a.com/"), kTemp);
NotifyStorageAccessed(client, GURL("http://c.com/"), kTemp);
- GetLRUOrigin(kTemp);
+ GetEvictionOrigin(kTemp);
base::RunLoop().RunUntilIdle();
- EXPECT_EQ("http://a.com/", lru_origin().spec());
+ EXPECT_EQ("http://a.com/", eviction_origin().spec());
// Notify origin http://a.com is in use.
NotifyOriginInUse(GURL("http://a.com/"));
- GetLRUOrigin(kTemp);
+ GetEvictionOrigin(kTemp);
base::RunLoop().RunUntilIdle();
- EXPECT_EQ("https://a.com/", lru_origin().spec());
+ EXPECT_EQ("https://a.com/", eviction_origin().spec());
- // Notify origin https://a.com is in use while GetLRUOrigin is running.
- GetLRUOrigin(kTemp);
+ // Notify origin https://a.com is in use while GetEvictionOrigin is running.
+ GetEvictionOrigin(kTemp);
NotifyOriginInUse(GURL("https://a.com/"));
base::RunLoop().RunUntilIdle();
// Post-filtering must have excluded the returned origin, so we will
// see empty result here.
- EXPECT_TRUE(lru_origin().is_empty());
+ EXPECT_TRUE(eviction_origin().is_empty());
- // Notify access for http://c.com while GetLRUOrigin is running.
- GetLRUOrigin(kTemp);
+ // Notify access for http://c.com while GetEvictionOrigin is running.
+ GetEvictionOrigin(kTemp);
NotifyStorageAccessed(client, GURL("http://c.com/"), kTemp);
base::RunLoop().RunUntilIdle();
// Post-filtering must have excluded the returned origin, so we will
// see empty result here.
- EXPECT_TRUE(lru_origin().is_empty());
+ EXPECT_TRUE(eviction_origin().is_empty());
NotifyOriginNoLongerInUse(GURL("http://a.com/"));
NotifyOriginNoLongerInUse(GURL("https://a.com/"));
- GetLRUOrigin(kTemp);
+ GetEvictionOrigin(kTemp);
base::RunLoop().RunUntilIdle();
- EXPECT_EQ("http://a.com/", lru_origin().spec());
+ EXPECT_EQ("http://a.com/", eviction_origin().spec());
}
TEST_F(QuotaManagerTest, GetOriginsModifiedSince) {
« no previous file with comments | « chrome/browser/engagement/site_engagement_eviction_policy_unittest.cc ('k') | content/browser/quota/quota_temporary_storage_evictor_unittest.cc » ('j') | storage/browser/quota/quota_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698