| Index: net/disk_cache/blockfile/backend_impl.cc
|
| diff --git a/net/disk_cache/blockfile/backend_impl.cc b/net/disk_cache/blockfile/backend_impl.cc
|
| index b2785431d38bbf97fa97823e70322f764e8fd364..c38b2bb9e33b49fa7e4945edc7380b235b5d3b8a 100644
|
| --- a/net/disk_cache/blockfile/backend_impl.cc
|
| +++ b/net/disk_cache/blockfile/backend_impl.cc
|
| @@ -1250,32 +1250,16 @@
|
| return net::ERR_IO_PENDING;
|
| }
|
|
|
| -class BackendImpl::IteratorImpl : public Backend::Iterator {
|
| - public:
|
| - explicit IteratorImpl(base::WeakPtr<InFlightBackendIO> background_queue)
|
| - : background_queue_(background_queue), data_(NULL) {
|
| - }
|
| -
|
| - virtual ~IteratorImpl() {
|
| - if (background_queue_)
|
| - background_queue_->EndEnumeration(data_);
|
| - }
|
| -
|
| - virtual int OpenNextEntry(Entry** next_entry,
|
| - const net::CompletionCallback& callback) OVERRIDE {
|
| - if (!background_queue_)
|
| - return net::ERR_FAILED;
|
| - background_queue_->OpenNextEntry(&data_, next_entry, callback);
|
| - return net::ERR_IO_PENDING;
|
| - }
|
| -
|
| - private:
|
| - const base::WeakPtr<InFlightBackendIO> background_queue_;
|
| - void* data_;
|
| -};
|
| -
|
| -scoped_ptr<Backend::Iterator> BackendImpl::CreateIterator() {
|
| - return scoped_ptr<Backend::Iterator>(new IteratorImpl(GetBackgroundQueue()));
|
| +int BackendImpl::OpenNextEntry(void** iter, Entry** next_entry,
|
| + const CompletionCallback& callback) {
|
| + DCHECK(!callback.is_null());
|
| + background_queue_.OpenNextEntry(iter, next_entry, callback);
|
| + return net::ERR_IO_PENDING;
|
| +}
|
| +
|
| +void BackendImpl::EndEnumeration(void** iter) {
|
| + background_queue_.EndEnumeration(*iter);
|
| + *iter = NULL;
|
| }
|
|
|
| void BackendImpl::GetStats(StatsItems* stats) {
|
|
|