summaryrefslogtreecommitdiffstats
path: root/webkit/browser
diff options
context:
space:
mode:
authortzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 12:16:02 +0000
committertzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 12:16:02 +0000
commit16c65a4ae644b5be5e465658abfd9c50d3b47e8f (patch)
tree94ced1aa1eae5a4e2553ecdf09b98d578cec7a6e /webkit/browser
parent28f8d885be32e32c278ce615cc31061aeee35804 (diff)
downloadchromium_src-16c65a4ae644b5be5e465658abfd9c50d3b47e8f.zip
chromium_src-16c65a4ae644b5be5e465658abfd9c50d3b47e8f.tar.gz
chromium_src-16c65a4ae644b5be5e465658abfd9c50d3b47e8f.tar.bz2
[Quota] Suppress disk space preservation for system on test.
That causes browser_tests failure on bot that have less than 1GB disk space for profile. BUG=230779, 354425 Review URL: https://codereview.chromium.org/220713002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/browser')
-rw-r--r--webkit/browser/quota/quota_manager.cc6
-rw-r--r--webkit/browser/quota/quota_manager.h5
2 files changed, 5 insertions, 6 deletions
diff --git a/webkit/browser/quota/quota_manager.cc b/webkit/browser/quota/quota_manager.cc
index a7e466e..fda57b6 100644
--- a/webkit/browser/quota/quota_manager.cc
+++ b/webkit/browser/quota/quota_manager.cc
@@ -63,14 +63,14 @@ const int64 QuotaManager::kPerHostPersistentQuotaLimit = 10 * 1024 * kMBytes;
const char QuotaManager::kDatabaseName[] = "QuotaManager";
+const int QuotaManager::kThresholdOfErrorsToBeBlacklisted = 3;
+
// Preserve kMinimumPreserveForSystem disk space for system book-keeping
// when returning the quota to unlimited apps/extensions.
// TODO(kinuko): This should be like 10% of the actual disk space.
// For now we simply use a constant as getting the disk size needs
// platform-dependent code. (http://crbug.com/178976)
-const int64 QuotaManager::kMinimumPreserveForSystem = 1024 * kMBytes;
-
-const int QuotaManager::kThresholdOfErrorsToBeBlacklisted = 3;
+int64 QuotaManager::kMinimumPreserveForSystem = 1024 * kMBytes;
const int QuotaManager::kEvictionIntervalInMilliSeconds =
30 * kMinutesInMilliSeconds;
diff --git a/webkit/browser/quota/quota_manager.h b/webkit/browser/quota/quota_manager.h
index a6eeb83..0ced311 100644
--- a/webkit/browser/quota/quota_manager.h
+++ b/webkit/browser/quota/quota_manager.h
@@ -233,15 +233,14 @@ class WEBKIT_STORAGE_BROWSER_EXPORT QuotaManager
static const char kDatabaseName[];
- static const int64 kMinimumPreserveForSystem;
-
static const int kThresholdOfErrorsToBeBlacklisted;
static const int kEvictionIntervalInMilliSeconds;
- // This is kept non-const so that test code can change the value.
+ // These are kept non-const so that test code can change the value.
// TODO(kinuko): Make this a real const value and add a proper way to set
// the quota for syncable storage. (http://crbug.com/155488)
+ static int64 kMinimumPreserveForSystem;
static int64 kSyncableStorageDefaultHostQuota;
protected: