| Index: storage/browser/fileapi/quota/quota_reservation.cc
|
| diff --git a/webkit/browser/fileapi/quota/quota_reservation.cc b/storage/browser/fileapi/quota/quota_reservation.cc
|
| similarity index 77%
|
| rename from webkit/browser/fileapi/quota/quota_reservation.cc
|
| rename to storage/browser/fileapi/quota/quota_reservation.cc
|
| index f199b35fbf0840d5e6f63c9101257deeb7310457..44f290a9c410a797364f251f6ab4c6852f80a0da 100644
|
| --- a/webkit/browser/fileapi/quota/quota_reservation.cc
|
| +++ b/storage/browser/fileapi/quota/quota_reservation.cc
|
| @@ -2,17 +2,16 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "webkit/browser/fileapi/quota/quota_reservation.h"
|
| +#include "storage/browser/fileapi/quota/quota_reservation.h"
|
|
|
| #include "base/bind.h"
|
| -#include "webkit/browser/fileapi/quota/open_file_handle.h"
|
| -#include "webkit/browser/fileapi/quota/quota_reservation_buffer.h"
|
| +#include "storage/browser/fileapi/quota/open_file_handle.h"
|
| +#include "storage/browser/fileapi/quota/quota_reservation_buffer.h"
|
|
|
| -namespace fileapi {
|
| +namespace storage {
|
|
|
| -void QuotaReservation::RefreshReservation(
|
| - int64 size,
|
| - const StatusCallback& callback) {
|
| +void QuotaReservation::RefreshReservation(int64 size,
|
| + const StatusCallback& callback) {
|
| DCHECK(sequence_checker_.CalledOnValidSequencedThread());
|
| DCHECK(!running_refresh_request_);
|
| DCHECK(!client_crashed_);
|
| @@ -22,10 +21,13 @@ void QuotaReservation::RefreshReservation(
|
| running_refresh_request_ = true;
|
|
|
| reservation_manager()->ReserveQuota(
|
| - origin(), type(), size - remaining_quota_,
|
| + origin(),
|
| + type(),
|
| + size - remaining_quota_,
|
| base::Bind(&QuotaReservation::AdaptDidUpdateReservedQuota,
|
| weak_ptr_factory_.GetWeakPtr(),
|
| - remaining_quota_, callback));
|
| + remaining_quota_,
|
| + callback));
|
|
|
| if (running_refresh_request_)
|
| remaining_quota_ = 0;
|
| @@ -71,8 +73,7 @@ FileSystemType QuotaReservation::type() const {
|
| return reservation_buffer_->type();
|
| }
|
|
|
| -QuotaReservation::QuotaReservation(
|
| - QuotaReservationBuffer* reservation_buffer)
|
| +QuotaReservation::QuotaReservation(QuotaReservationBuffer* reservation_buffer)
|
| : client_crashed_(false),
|
| running_refresh_request_(false),
|
| remaining_quota_(0),
|
| @@ -104,11 +105,10 @@ bool QuotaReservation::AdaptDidUpdateReservedQuota(
|
| previous_size, callback, error, delta);
|
| }
|
|
|
| -bool QuotaReservation::DidUpdateReservedQuota(
|
| - int64 previous_size,
|
| - const StatusCallback& callback,
|
| - base::File::Error error,
|
| - int64 delta) {
|
| +bool QuotaReservation::DidUpdateReservedQuota(int64 previous_size,
|
| + const StatusCallback& callback,
|
| + base::File::Error error,
|
| + int64 delta) {
|
| DCHECK(sequence_checker_.CalledOnValidSequencedThread());
|
| DCHECK(running_refresh_request_);
|
| running_refresh_request_ = false;
|
| @@ -124,4 +124,4 @@ bool QuotaReservation::DidUpdateReservedQuota(
|
| return true;
|
| }
|
|
|
| -} // namespace fileapi
|
| +} // namespace storage
|
|
|