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

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

Issue 1782053004: Change how the quota system computes the total poolsize for temporary storage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 3 years, 10 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
Index: content/browser/quota/storage_monitor_unittest.cc
diff --git a/content/browser/quota/storage_monitor_unittest.cc b/content/browser/quota/storage_monitor_unittest.cc
index 7cbeb9140ee282a0040c544ad2f01b833b833845..12512cf2bd644ed474ccd5c6a1fa61b79e31d4ff 100644
--- a/content/browser/quota/storage_monitor_unittest.cc
+++ b/content/browser/quota/storage_monitor_unittest.cc
@@ -68,7 +68,8 @@ class UsageMockQuotaManager : public QuotaManager {
base::FilePath(),
base::ThreadTaskRunnerHandle::Get().get(),
base::ThreadTaskRunnerHandle::Get().get(),
- special_storage_policy),
+ special_storage_policy,
+ storage::GetQuotaSettingsFunc()),
callback_usage_(0),
callback_quota_(0),
callback_status_(kQuotaStatusOk),
@@ -88,7 +89,7 @@ class UsageMockQuotaManager : public QuotaManager {
void GetUsageAndQuotaForWebApps(
const GURL& origin,
StorageType type,
- const GetUsageAndQuotaCallback& callback) override {
+ const UsageAndQuotaCallback& callback) override {
if (initialized_)
callback.Run(callback_status_, callback_usage_, callback_quota_);
else
@@ -103,7 +104,7 @@ class UsageMockQuotaManager : public QuotaManager {
int64_t callback_quota_;
QuotaStatusCode callback_status_;
bool initialized_;
- GetUsageAndQuotaCallback delayed_callback_;
+ UsageAndQuotaCallback delayed_callback_;
};
} // namespace
@@ -649,7 +650,8 @@ class StorageMonitorIntegrationTest : public testing::Test {
storage_policy_ = new MockSpecialStoragePolicy();
quota_manager_ = new QuotaManager(
false, data_dir_.GetPath(), base::ThreadTaskRunnerHandle::Get().get(),
- base::ThreadTaskRunnerHandle::Get().get(), storage_policy_.get());
+ base::ThreadTaskRunnerHandle::Get().get(), storage_policy_.get(),
+ storage::GetQuotaSettingsFunc());
client_ = new MockStorageClient(quota_manager_->proxy(),
NULL,
« no previous file with comments | « content/browser/quota/quota_temporary_storage_evictor_unittest.cc ('k') | content/browser/storage_partition_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698