1 files changed, 9 insertions, 8 deletions

diff --git a/chromium/webkit/browser/fileapi/quota/quota_reservation_buffer.cc b/chromium/webkit/browser/fileapi/quota/quota_reservation_buffer.cc
index 14ea0d0cd81..9e443190c9d 100644
--- a/chromium/webkit/browser/fileapi/quota/quota_reservation_buffer.cc
+++ b/chromium/webkit/browser/fileapi/quota/quota_reservation_buffer.cc
@@ -39,23 +39,23 @@ scoped_ptr<OpenFileHandle> QuotaReservationBuffer::GetOpenFileHandle(
   return make_scoped_ptr(new OpenFileHandle(reservation, *open_file));
 }
 
-void QuotaReservationBuffer::CommitFileGrowth(int64 quota_consumption,
+void QuotaReservationBuffer::CommitFileGrowth(int64 reserved_quota_consumption,
                                               int64 usage_delta) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   if (!reservation_manager_)
     return;
   reservation_manager_->CommitQuotaUsage(origin_, type_, usage_delta);
 
-  if (quota_consumption > 0) {
-    if (quota_consumption > reserved_quota_) {
+  if (reserved_quota_consumption > 0) {
+    if (reserved_quota_consumption > reserved_quota_) {
       LOG(ERROR) << "Detected over consumption of the storage quota beyond its"
                  << " reservation";
-      quota_consumption = reserved_quota_;
+      reserved_quota_consumption = reserved_quota_;
     }
 
-    reserved_quota_ -= quota_consumption;
+    reserved_quota_ -= reserved_quota_consumption;
     reservation_manager_->ReleaseReservedQuota(
-        origin_, type_, quota_consumption);
+        origin_, type_, reserved_quota_consumption);
   }
 }
 
@@ -92,9 +92,10 @@ bool QuotaReservationBuffer::DecrementDirtyCount(
     base::WeakPtr<QuotaReservationManager> reservation_manager,
     const GURL& origin,
     FileSystemType type,
-    base::PlatformFileError error) {
+    base::File::Error error,
+    int64 delta_unused) {
   DCHECK(origin.is_valid());
-  if (error == base::PLATFORM_FILE_OK && reservation_manager) {
+  if (error == base::File::FILE_OK && reservation_manager) {
     reservation_manager->DecrementDirtyCount(origin, type);
     return true;
   }