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 980ddc73a53fff7f782f8da201f21951cae28e56..7484339b67cbaf6f737c3f7730c69bbd97f66249 100644 |
--- a/net/disk_cache/blockfile/backend_impl.cc |
+++ b/net/disk_cache/blockfile/backend_impl.cc |
@@ -387,7 +387,7 @@ int BackendImpl::SyncDoomEntriesBetween(const base::Time initial_time, |
return net::ERR_FAILED; |
EntryImpl* node; |
- scoped_ptr<Rankings::Iterator> iterator(new Rankings::Iterator()); |
+ std::unique_ptr<Rankings::Iterator> iterator(new Rankings::Iterator()); |
EntryImpl* next = OpenNextEntryImpl(iterator.get()); |
if (!next) |
return net::OK; |
@@ -429,7 +429,7 @@ int BackendImpl::SyncDoomEntriesSince(const base::Time initial_time) { |
stats_.OnEvent(Stats::DOOM_RECENT); |
for (;;) { |
- scoped_ptr<Rankings::Iterator> iterator(new Rankings::Iterator()); |
+ std::unique_ptr<Rankings::Iterator> iterator(new Rankings::Iterator()); |
EntryImpl* entry = OpenNextEntryImpl(iterator.get()); |
if (!entry) |
return net::OK; |
@@ -453,7 +453,8 @@ int BackendImpl::SyncOpenNextEntry(Rankings::Iterator* iterator, |
return (*next_entry) ? net::OK : net::ERR_FAILED; |
} |
-void BackendImpl::SyncEndEnumeration(scoped_ptr<Rankings::Iterator> iterator) { |
+void BackendImpl::SyncEndEnumeration( |
+ std::unique_ptr<Rankings::Iterator> iterator) { |
iterator->Reset(); |
} |
@@ -1296,11 +1297,12 @@ class BackendImpl::IteratorImpl : public Backend::Iterator { |
private: |
const base::WeakPtr<InFlightBackendIO> background_queue_; |
- scoped_ptr<Rankings::Iterator> iterator_; |
+ std::unique_ptr<Rankings::Iterator> iterator_; |
}; |
-scoped_ptr<Backend::Iterator> BackendImpl::CreateIterator() { |
- return scoped_ptr<Backend::Iterator>(new IteratorImpl(GetBackgroundQueue())); |
+std::unique_ptr<Backend::Iterator> BackendImpl::CreateIterator() { |
+ return std::unique_ptr<Backend::Iterator>( |
+ new IteratorImpl(GetBackgroundQueue())); |
} |
void BackendImpl::GetStats(StatsItems* stats) { |
@@ -1456,7 +1458,7 @@ bool BackendImpl::InitStats() { |
if (!file) |
return false; |
- scoped_ptr<char[]> data(new char[size]); |
+ std::unique_ptr<char[]> data(new char[size]); |
size_t offset = address.start_block() * address.BlockSize() + |
kBlockHeaderSize; |
if (!file->Read(data.get(), size, offset)) |
@@ -1471,7 +1473,7 @@ bool BackendImpl::InitStats() { |
void BackendImpl::StoreStats() { |
int size = stats_.StorageSize(); |
- scoped_ptr<char[]> data(new char[size]); |
+ std::unique_ptr<char[]> data(new char[size]); |
Addr address; |
size = stats_.SerializeStats(data.get(), size, &address); |
DCHECK(size); |