summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-14 10:23:59 +0000
committertzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-14 10:23:59 +0000
commitae4bb64d5dbfc0470a83c32afd06e864b22bd384 (patch)
tree826c9f17ab599a71b899b6d46112f2af57d8aeac /webkit
parentc5f9af29edd463d16c78d46f5d796498b5484122 (diff)
downloadchromium_src-ae4bb64d5dbfc0470a83c32afd06e864b22bd384.zip
chromium_src-ae4bb64d5dbfc0470a83c32afd06e864b22bd384.tar.gz
chromium_src-ae4bb64d5dbfc0470a83c32afd06e864b22bd384.tar.bz2
Revert 109855 - Fix quota value overflow.
BUG=104111 TEST='QuotaManagerTest.*' Review URL: http://codereview.chromium.org/8560007 TBR=tzik@chromium.org Review URL: http://codereview.chromium.org/8528021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109856 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/quota/quota_manager.cc2
-rw-r--r--webkit/quota/quota_manager_unittest.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/webkit/quota/quota_manager.cc b/webkit/quota/quota_manager.cc
index 433e975..655dade 100644
--- a/webkit/quota/quota_manager.cc
+++ b/webkit/quota/quota_manager.cc
@@ -755,7 +755,7 @@ class QuotaManager::UpdatePersistentHostQuotaTask
UpdatePersistentHostQuotaTask(
QuotaManager* manager,
const std::string& host,
- int64 new_quota,
+ int new_quota,
const HostQuotaCallback& callback)
: DatabaseTaskBase(manager),
host_(host),
diff --git a/webkit/quota/quota_manager_unittest.cc b/webkit/quota/quota_manager_unittest.cc
index 48f3351..b3d71e4 100644
--- a/webkit/quota/quota_manager_unittest.cc
+++ b/webkit/quota/quota_manager_unittest.cc
@@ -895,10 +895,10 @@ TEST_F(QuotaManagerTest, GetAndSetPerststentHostQuota) {
GetPersistentHostQuota("foo.com");
SetPersistentHostQuota("foo.com", 200);
GetPersistentHostQuota("foo.com");
- SetPersistentHostQuota("foo.com", 300000000000);
+ SetPersistentHostQuota("foo.com", 300);
GetPersistentHostQuota("foo.com");
MessageLoop::current()->RunAllPending();
- EXPECT_EQ(300000000000, quota());
+ EXPECT_EQ(300, quota());
}
TEST_F(QuotaManagerTest, GetAndSetPersistentUsageAndQuota) {