summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/browsing_data_quota_helper_unittest.cc5
-rw-r--r--webkit/quota/mock_storage_client.cc33
-rw-r--r--webkit/quota/mock_storage_client.h3
-rw-r--r--webkit/quota/quota_client.h1
-rw-r--r--webkit/quota/quota_manager_unittest.cc115
5 files changed, 73 insertions, 84 deletions
diff --git a/chrome/browser/browsing_data_quota_helper_unittest.cc b/chrome/browser/browsing_data_quota_helper_unittest.cc
index 153af34..a85f463 100644
--- a/chrome/browser/browsing_data_quota_helper_unittest.cc
+++ b/chrome/browser/browsing_data_quota_helper_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -71,7 +71,8 @@ class BrowsingDataQuotaHelperTest : public testing::Test {
void RegisterClient(const quota::MockOriginData* data, std::size_t data_len) {
quota::MockStorageClient* client =
new quota::MockStorageClient(
- quota_manager_->proxy(), data, data_len);
+ quota_manager_->proxy(), data, quota::QuotaClient::kFileSystem,
+ data_len);
quota_manager_->proxy()->RegisterClient(client);
client->TouchAllOriginsAndNotify();
}
diff --git a/webkit/quota/mock_storage_client.cc b/webkit/quota/mock_storage_client.cc
index 6a07989..1e786e5 100644
--- a/webkit/quota/mock_storage_client.cc
+++ b/webkit/quota/mock_storage_client.cc
@@ -18,41 +18,8 @@ using base::AtomicSequenceNumber;
namespace quota {
-namespace {
-
using std::make_pair;
-class MockStorageClientIDSequencer {
- public:
- static MockStorageClientIDSequencer* GetInstance() {
- return Singleton<MockStorageClientIDSequencer>::get();
- }
-
- QuotaClient::ID NextMockID() {
- return static_cast<QuotaClient::ID>(
- QuotaClient::kMockStart + seq_.GetNext());
- }
-
- private:
- MockStorageClientIDSequencer() { }
- friend struct DefaultSingletonTraits<MockStorageClientIDSequencer>;
- AtomicSequenceNumber seq_;
-
- DISALLOW_COPY_AND_ASSIGN(MockStorageClientIDSequencer);
-};
-
-} // anonymous namespace
-
-MockStorageClient::MockStorageClient(
- QuotaManagerProxy* quota_manager_proxy,
- const MockOriginData* mock_data, size_t mock_data_size)
- : quota_manager_proxy_(quota_manager_proxy),
- id_(MockStorageClientIDSequencer::GetInstance()->NextMockID()),
- mock_time_counter_(0),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
- Populate(mock_data, mock_data_size);
-}
-
MockStorageClient::MockStorageClient(
QuotaManagerProxy* quota_manager_proxy,
const MockOriginData* mock_data, QuotaClient::ID id, size_t mock_data_size)
diff --git a/webkit/quota/mock_storage_client.h b/webkit/quota/mock_storage_client.h
index d6a7a46..f8c3dd0 100644
--- a/webkit/quota/mock_storage_client.h
+++ b/webkit/quota/mock_storage_client.h
@@ -31,9 +31,6 @@ class MockStorageClient : public QuotaClient {
public:
MockStorageClient(QuotaManagerProxy* quota_manager_proxy,
const MockOriginData* mock_data,
- size_t mock_data_size);
- MockStorageClient(QuotaManagerProxy* quota_manager_proxy,
- const MockOriginData* mock_data,
QuotaClient::ID id,
size_t mock_data_size);
virtual ~MockStorageClient();
diff --git a/webkit/quota/quota_client.h b/webkit/quota/quota_client.h
index ab870c2..06c4ceb 100644
--- a/webkit/quota/quota_client.h
+++ b/webkit/quota/quota_client.h
@@ -35,7 +35,6 @@ class QuotaClient {
kDatabase = 1 << 2,
kAppcache = 1 << 3,
kIndexedDatabase = 1 << 4,
- kMockStart = 1 << 5, // This needs to be the end of the enum.
};
static const int kAllClientsMask = -1;
diff --git a/webkit/quota/quota_manager_unittest.cc b/webkit/quota/quota_manager_unittest.cc
index 949e6ab..9c0136f 100644
--- a/webkit/quota/quota_manager_unittest.cc
+++ b/webkit/quota/quota_manager_unittest.cc
@@ -67,11 +67,6 @@ class QuotaManagerTest : public testing::Test {
protected:
MockStorageClient* CreateClient(
- const MockOriginData* mock_data, size_t mock_data_size) {
- return new MockStorageClient(quota_manager_->proxy(),
- mock_data, mock_data_size);
- }
- MockStorageClient* CreateClient(
const MockOriginData* mock_data,
size_t mock_data_size,
QuotaClient::ID id) {
@@ -445,8 +440,10 @@ TEST_F(QuotaManagerTest, GetUsageInfo) {
{ "http://bar.com/", kPerm, 40 },
{ "http://example.com/", kPerm, 40 },
};
- RegisterClient(CreateClient(kData1, ARRAYSIZE_UNSAFE(kData1)));
- RegisterClient(CreateClient(kData2, ARRAYSIZE_UNSAFE(kData2)));
+ RegisterClient(CreateClient(kData1, ARRAYSIZE_UNSAFE(kData1),
+ QuotaClient::kFileSystem));
+ RegisterClient(CreateClient(kData2, ARRAYSIZE_UNSAFE(kData2),
+ QuotaClient::kDatabase));
GetUsageInfo();
MessageLoop::current()->RunAllPending();
@@ -474,7 +471,8 @@ TEST_F(QuotaManagerTest, GetUsageAndQuota_Simple) {
{ "http://foo.com/", kTemp, 10 },
{ "http://foo.com/", kPerm, 80 },
};
- RegisterClient(CreateClient(kData, ARRAYSIZE_UNSAFE(kData)));
+ RegisterClient(CreateClient(kData, ARRAYSIZE_UNSAFE(kData),
+ QuotaClient::kFileSystem));
GetUsageAndQuota(GURL("http://foo.com/"), kPerm);
MessageLoop::current()->RunAllPending();
@@ -527,7 +525,7 @@ TEST_F(QuotaManagerTest, GetUsage_NoClient) {
}
TEST_F(QuotaManagerTest, GetUsage_EmptyClient) {
- RegisterClient(CreateClient(NULL, 0));
+ RegisterClient(CreateClient(NULL, 0, QuotaClient::kFileSystem));
GetUsageAndQuota(GURL("http://foo.com/"), kTemp);
MessageLoop::current()->RunAllPending();
EXPECT_EQ(kQuotaStatusOk, status());
@@ -566,7 +564,8 @@ TEST_F(QuotaManagerTest, GetTemporaryUsageAndQuota_MultiOrigins) {
{ "http://baz.com/", kTemp, 30 },
{ "http://foo.com/", kPerm, 40 },
};
- RegisterClient(CreateClient(kData, ARRAYSIZE_UNSAFE(kData)));
+ RegisterClient(CreateClient(kData, ARRAYSIZE_UNSAFE(kData),
+ QuotaClient::kFileSystem));
// This time explicitly sets a temporary global quota.
SetTemporaryGlobalQuota(100);
@@ -606,8 +605,10 @@ TEST_F(QuotaManagerTest, GetUsage_MultipleClients) {
{ "http://unlimited/", kTemp, 1 },
};
mock_special_storage_policy()->AddUnlimited(GURL("http://unlimited/"));
- RegisterClient(CreateClient(kData1, ARRAYSIZE_UNSAFE(kData1)));
- RegisterClient(CreateClient(kData2, ARRAYSIZE_UNSAFE(kData2)));
+ RegisterClient(CreateClient(kData1, ARRAYSIZE_UNSAFE(kData1),
+ QuotaClient::kFileSystem));
+ RegisterClient(CreateClient(kData2, ARRAYSIZE_UNSAFE(kData2),
+ QuotaClient::kDatabase));
GetUsageAndQuota(GURL("http://foo.com/"), kTemp);
MessageLoop::current()->RunAllPending();
@@ -649,7 +650,8 @@ void QuotaManagerTest::GetUsage_WithModifyTestBody(const StorageType type) {
{ "http://foo.com/", type, 10 },
{ "http://foo.com:1/", type, 20 },
};
- MockStorageClient* client = CreateClient(data, ARRAYSIZE_UNSAFE(data));
+ MockStorageClient* client = CreateClient(data, ARRAYSIZE_UNSAFE(data),
+ QuotaClient::kFileSystem);
RegisterClient(client);
GetUsageAndQuota(GURL("http://foo.com/"), type);
@@ -690,7 +692,8 @@ TEST_F(QuotaManagerTest, GetTemporaryUsageAndQuota_WithAdditionalTasks) {
{ "http://bar.com/", kTemp, 13 },
{ "http://foo.com/", kPerm, 40 },
};
- RegisterClient(CreateClient(kData, ARRAYSIZE_UNSAFE(kData)));
+ RegisterClient(CreateClient(kData, ARRAYSIZE_UNSAFE(kData),
+ QuotaClient::kFileSystem));
SetTemporaryGlobalQuota(100);
MessageLoop::current()->RunAllPending();
@@ -724,7 +727,8 @@ TEST_F(QuotaManagerTest, GetTemporaryUsageAndQuota_NukeManager) {
{ "http://bar.com/", kTemp, 13 },
{ "http://foo.com/", kPerm, 40 },
};
- RegisterClient(CreateClient(kData, ARRAYSIZE_UNSAFE(kData)));
+ RegisterClient(CreateClient(kData, ARRAYSIZE_UNSAFE(kData),
+ QuotaClient::kFileSystem));
SetTemporaryGlobalQuota(100);
MessageLoop::current()->RunAllPending();
@@ -750,7 +754,8 @@ TEST_F(QuotaManagerTest, GetTemporaryUsageAndQuota_Overbudget) {
{ "http://usage10/", kTemp, 10 },
{ "http://usage200/", kTemp, 200 },
};
- RegisterClient(CreateClient(kData, ARRAYSIZE_UNSAFE(kData)));
+ RegisterClient(CreateClient(kData, ARRAYSIZE_UNSAFE(kData),
+ QuotaClient::kFileSystem));
SetTemporaryGlobalQuota(100);
MessageLoop::current()->RunAllPending();
@@ -782,7 +787,8 @@ TEST_F(QuotaManagerTest, GetTemporaryUsageAndQuota_Unlimited) {
{ "http://unlimited/", kTemp, 4000 },
};
mock_special_storage_policy()->AddUnlimited(GURL("http://unlimited/"));
- MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData));
+ MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData),
+ QuotaClient::kFileSystem);
RegisterClient(client);
// Test when not overbugdet.
@@ -891,7 +897,7 @@ TEST_F(QuotaManagerTest, OriginInUse) {
}
TEST_F(QuotaManagerTest, GetAndSetPerststentHostQuota) {
- RegisterClient(CreateClient(NULL, 0));
+ RegisterClient(CreateClient(NULL, 0, QuotaClient::kFileSystem));
GetPersistentHostQuota("foo.com");
MessageLoop::current()->RunAllPending();
@@ -913,7 +919,7 @@ TEST_F(QuotaManagerTest, GetAndSetPerststentHostQuota) {
}
TEST_F(QuotaManagerTest, GetAndSetPersistentUsageAndQuota) {
- RegisterClient(CreateClient(NULL, 0));
+ RegisterClient(CreateClient(NULL, 0, QuotaClient::kFileSystem));
GetUsageAndQuota(GURL("http://foo.com/"), kPerm);
MessageLoop::current()->RunAllPending();
@@ -940,7 +946,8 @@ TEST_F(QuotaManagerTest, GetPersistentUsageAndQuota_MultiOrigins) {
{ "http://baz.com/", kPerm, 30 },
{ "http://foo.com/", kTemp, 40 },
};
- RegisterClient(CreateClient(kData, ARRAYSIZE_UNSAFE(kData)));
+ RegisterClient(CreateClient(kData, ARRAYSIZE_UNSAFE(kData),
+ QuotaClient::kFileSystem));
SetPersistentHostQuota("foo.com", 100);
GetUsageAndQuota(GURL("http://foo.com/"), kPerm);
@@ -961,7 +968,8 @@ TEST_F(QuotaManagerTest, GetPersistentUsageAndQuota_WithAdditionalTasks) {
{ "http://bar.com/", kPerm, 13 },
{ "http://foo.com/", kTemp, 40 },
};
- RegisterClient(CreateClient(kData, ARRAYSIZE_UNSAFE(kData)));
+ RegisterClient(CreateClient(kData, ARRAYSIZE_UNSAFE(kData),
+ QuotaClient::kFileSystem));
SetPersistentHostQuota("foo.com", 100);
GetUsageAndQuota(GURL("http://foo.com/"), kPerm);
@@ -991,7 +999,8 @@ TEST_F(QuotaManagerTest, GetPersistentUsageAndQuota_NukeManager) {
{ "http://bar.com/", kPerm, 13 },
{ "http://foo.com/", kTemp, 40 },
};
- RegisterClient(CreateClient(kData, ARRAYSIZE_UNSAFE(kData)));
+ RegisterClient(CreateClient(kData, ARRAYSIZE_UNSAFE(kData),
+ QuotaClient::kFileSystem));
SetPersistentHostQuota("foo.com", 100);
set_additional_callback_count(0);
@@ -1017,7 +1026,8 @@ TEST_F(QuotaManagerTest, GetUsage_Simple) {
{ "http://bar.com:1/", kPerm, 600000 },
{ "http://foo.com/", kTemp, 7000000 },
};
- RegisterClient(CreateClient(kData, ARRAYSIZE_UNSAFE(kData)));
+ RegisterClient(CreateClient(kData, ARRAYSIZE_UNSAFE(kData),
+ QuotaClient::kFileSystem));
GetGlobalUsage(kPerm);
MessageLoop::current()->RunAllPending();
@@ -1049,7 +1059,8 @@ TEST_F(QuotaManagerTest, GetUsage_WithModification) {
{ "http://foo.com/", kTemp, 7000000 },
};
- MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData));
+ MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData),
+ QuotaClient::kFileSystem);
RegisterClient(client);
GetGlobalUsage(kPerm);
@@ -1097,7 +1108,8 @@ TEST_F(QuotaManagerTest, GetUsage_WithDeleteOrigin) {
{ "http://foo.com/", kPerm, 300 },
{ "http://bar.com/", kTemp, 4000 },
};
- MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData));
+ MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData),
+ QuotaClient::kFileSystem);
RegisterClient(client);
GetGlobalUsage(kTemp);
@@ -1151,8 +1163,10 @@ TEST_F(QuotaManagerTest, EvictOriginData) {
{ "https://foo.com/", kTemp, 80 },
{ "http://bar.com/", kTemp, 9 },
};
- MockStorageClient* client1 = CreateClient(kData1, ARRAYSIZE_UNSAFE(kData1));
- MockStorageClient* client2 = CreateClient(kData2, ARRAYSIZE_UNSAFE(kData2));
+ MockStorageClient* client1 = CreateClient(kData1, ARRAYSIZE_UNSAFE(kData1),
+ QuotaClient::kFileSystem);
+ MockStorageClient* client2 = CreateClient(kData2, ARRAYSIZE_UNSAFE(kData2),
+ QuotaClient::kDatabase);
RegisterClient(client1);
RegisterClient(client2);
@@ -1169,10 +1183,10 @@ TEST_F(QuotaManagerTest, EvictOriginData) {
int64 predelete_host_pers = usage();
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kData1); ++i)
- quota_manager()->NotifyStorageAccessed(QuotaClient::kMockStart,
+ quota_manager()->NotifyStorageAccessed(QuotaClient::kUnknown,
GURL(kData1[i].origin), kData1[i].type);
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kData2); ++i)
- quota_manager()->NotifyStorageAccessed(QuotaClient::kMockStart,
+ quota_manager()->NotifyStorageAccessed(QuotaClient::kUnknown,
GURL(kData2[i].origin), kData2[i].type);
MessageLoop::current()->RunAllPending();
@@ -1211,7 +1225,8 @@ TEST_F(QuotaManagerTest, EvictOriginDataWithDeletionError) {
{ "http://bar.com/", kTemp, 4000 },
};
static const int kNumberOfTemporaryOrigins = 3;
- MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData));
+ MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData),
+ QuotaClient::kFileSystem);
RegisterClient(client);
GetGlobalUsage(kTemp);
@@ -1296,7 +1311,8 @@ TEST_F(QuotaManagerTest, GetUsageAndQuotaForEviction) {
};
mock_special_storage_policy()->AddUnlimited(GURL("http://unlimited/"));
- MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData));
+ MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData),
+ QuotaClient::kFileSystem);
RegisterClient(client);
SetTemporaryGlobalQuota(10000000);
@@ -1315,7 +1331,8 @@ TEST_F(QuotaManagerTest, DeleteHostDataSimple) {
static const MockOriginData kData[] = {
{ "http://foo.com/", kTemp, 1 },
};
- MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData));
+ MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData),
+ QuotaClient::kFileSystem);
RegisterClient(client);
GetGlobalUsage(kTemp);
@@ -1377,8 +1394,10 @@ TEST_F(QuotaManagerTest, DeleteHostDataMultiple) {
{ "https://foo.com/", kTemp, 80 },
{ "http://bar.com/", kTemp, 9 },
};
- MockStorageClient* client1 = CreateClient(kData1, ARRAYSIZE_UNSAFE(kData1));
- MockStorageClient* client2 = CreateClient(kData2, ARRAYSIZE_UNSAFE(kData2));
+ MockStorageClient* client1 = CreateClient(kData1, ARRAYSIZE_UNSAFE(kData1),
+ QuotaClient::kFileSystem);
+ MockStorageClient* client2 = CreateClient(kData2, ARRAYSIZE_UNSAFE(kData2),
+ QuotaClient::kDatabase);
RegisterClient(client1);
RegisterClient(client2);
@@ -1463,8 +1482,10 @@ TEST_F(QuotaManagerTest, DeleteOriginDataMultiple) {
{ "https://foo.com/", kTemp, 80 },
{ "http://bar.com/", kTemp, 9 },
};
- MockStorageClient* client1 = CreateClient(kData1, ARRAYSIZE_UNSAFE(kData1));
- MockStorageClient* client2 = CreateClient(kData2, ARRAYSIZE_UNSAFE(kData2));
+ MockStorageClient* client1 = CreateClient(kData1, ARRAYSIZE_UNSAFE(kData1),
+ QuotaClient::kFileSystem);
+ MockStorageClient* client2 = CreateClient(kData2, ARRAYSIZE_UNSAFE(kData2),
+ QuotaClient::kDatabase);
RegisterClient(client1);
RegisterClient(client2);
@@ -1489,10 +1510,10 @@ TEST_F(QuotaManagerTest, DeleteOriginDataMultiple) {
const int64 predelete_bar_pers = usage();
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kData1); ++i)
- quota_manager()->NotifyStorageAccessed(QuotaClient::kMockStart,
+ quota_manager()->NotifyStorageAccessed(QuotaClient::kUnknown,
GURL(kData1[i].origin), kData1[i].type);
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kData2); ++i)
- quota_manager()->NotifyStorageAccessed(QuotaClient::kMockStart,
+ quota_manager()->NotifyStorageAccessed(QuotaClient::kUnknown,
GURL(kData2[i].origin), kData2[i].type);
MessageLoop::current()->RunAllPending();
@@ -1545,7 +1566,8 @@ TEST_F(QuotaManagerTest, GetCachedOrigins) {
{ "http://b.com/", kPerm, 300 },
{ "http://c.com/", kTemp, 4000 },
};
- MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData));
+ MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData),
+ QuotaClient::kFileSystem);
RegisterClient(client);
// TODO(kinuko): Be careful when we add cache pruner.
@@ -1588,7 +1610,8 @@ TEST_F(QuotaManagerTest, NotifyAndLRUOrigin) {
{ "http://b.com/", kPerm, 0 }, // persistent
{ "http://c.com/", kTemp, 0 },
};
- MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData));
+ MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData),
+ QuotaClient::kFileSystem);
RegisterClient(client);
GURL origin;
@@ -1627,7 +1650,8 @@ TEST_F(QuotaManagerTest, GetLRUOriginWithOriginInUse) {
{ "http://b.com/", kPerm, 0 }, // persistent
{ "http://c.com/", kTemp, 0 },
};
- MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData));
+ MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData),
+ QuotaClient::kFileSystem);
RegisterClient(client);
GURL origin;
@@ -1681,7 +1705,8 @@ TEST_F(QuotaManagerTest, GetOriginsModifiedSince) {
{ "http://b.com/", kPerm, 0 }, // persistent
{ "http://c.com/", kTemp, 0 },
};
- MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData));
+ MockStorageClient* client = CreateClient(kData, ARRAYSIZE_UNSAFE(kData),
+ QuotaClient::kFileSystem);
RegisterClient(client);
GetOriginsModifiedSince(kTemp, base::Time());
@@ -1757,15 +1782,15 @@ TEST_F(QuotaManagerTest, DumpOriginInfoTable) {
using std::make_pair;
quota_manager()->NotifyStorageAccessed(
- QuotaClient::kMockStart,
+ QuotaClient::kUnknown,
GURL("http://example.com/"),
kTemp);
quota_manager()->NotifyStorageAccessed(
- QuotaClient::kMockStart,
+ QuotaClient::kUnknown,
GURL("http://example.com/"),
kPerm);
quota_manager()->NotifyStorageAccessed(
- QuotaClient::kMockStart,
+ QuotaClient::kUnknown,
GURL("http://example.com/"),
kPerm);
MessageLoop::current()->RunAllPending();
generated by cgit v1.1 at 2025-01-30 18:50:21 +0000