diff options
| author | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 22:03:25 +0000 |
|---|---|---|
| committer | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 22:03:25 +0000 |
| commit | 51a8a96670c67c7018d504a90ed4e1f000ae9267 (patch) | |
| tree | 30e825892c4f4181d48695647186d326c79937d5 | |
| parent | ecaf74c14bb10084cad931a3bc8b06b42630bfd7 (diff) | |
| download | chromium_src-51a8a96670c67c7018d504a90ed4e1f000ae9267.zip chromium_src-51a8a96670c67c7018d504a90ed4e1f000ae9267.tar.gz chromium_src-51a8a96670c67c7018d504a90ed4e1f000ae9267.tar.bz2 | |
Merge 109871 - Fix quota value overflow (reland).
BUG=104111
TEST='QuotaManagerTest.*'
Review URL: http://codereview.chromium.org/8528022
TBR=tzik@chromium.org
Review URL: http://codereview.chromium.org/8572029
git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@110183 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/quota/quota_manager.cc | 2 | ||||
| -rw-r--r-- | webkit/quota/quota_manager_unittest.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/webkit/quota/quota_manager.cc b/webkit/quota/quota_manager.cc index 5b417fa..b4a7ec5 100644 --- a/webkit/quota/quota_manager.cc +++ b/webkit/quota/quota_manager.cc @@ -661,7 +661,7 @@ class QuotaManager::UpdatePersistentHostQuotaTask UpdatePersistentHostQuotaTask( QuotaManager* manager, const std::string& host, - int new_quota, + int64 new_quota, HostQuotaCallback* callback) : DatabaseTaskBase(manager), host_(host), diff --git a/webkit/quota/quota_manager_unittest.cc b/webkit/quota/quota_manager_unittest.cc index 949a4d8..5f09ffb 100644 --- a/webkit/quota/quota_manager_unittest.cc +++ b/webkit/quota/quota_manager_unittest.cc @@ -878,10 +878,10 @@ TEST_F(QuotaManagerTest, GetAndSetPerststentHostQuota) { GetPersistentHostQuota("foo.com"); SetPersistentHostQuota("foo.com", 200); GetPersistentHostQuota("foo.com"); - SetPersistentHostQuota("foo.com", 300); + SetPersistentHostQuota("foo.com", 300000000000ll); GetPersistentHostQuota("foo.com"); MessageLoop::current()->RunAllPending(); - EXPECT_EQ(300, quota()); + EXPECT_EQ(300000000000ll, quota()); } TEST_F(QuotaManagerTest, GetAndSetPersistentUsageAndQuota) { |