Index: net/disk_cache/blockfile/backend_impl.h |
diff --git a/net/disk_cache/blockfile/backend_impl.h b/net/disk_cache/blockfile/backend_impl.h |
index 89edef2eb58417447921e0d16655ce001a21ff0e..cbc854bf591662b1a54ecc821ab13d52100d8619 100644 |
--- a/net/disk_cache/blockfile/backend_impl.h |
+++ b/net/disk_cache/blockfile/backend_impl.h |
@@ -79,7 +79,7 @@ class NET_EXPORT_PRIVATE BackendImpl : public Backend { |
int SyncCalculateSizeOfAllEntries(); |
int SyncDoomEntriesSince(base::Time initial_time); |
int SyncOpenNextEntry(Rankings::Iterator* iterator, Entry** next_entry); |
- void SyncEndEnumeration(scoped_ptr<Rankings::Iterator> iterator); |
+ void SyncEndEnumeration(std::unique_ptr<Rankings::Iterator> iterator); |
void SyncOnExternalCacheHit(const std::string& key); |
// Open or create an entry for the given |key| or |iter|. |
@@ -288,7 +288,7 @@ class NET_EXPORT_PRIVATE BackendImpl : public Backend { |
// the iterator (for example, deleting the entry) will invalidate the |
// iterator. Performing operations on an entry that modify the entry may |
// result in loops in the iteration, skipped entries or similar. |
- scoped_ptr<Iterator> CreateIterator() override; |
+ std::unique_ptr<Iterator> CreateIterator() override; |
void GetStats(StatsItems* stats) override; |
void OnExternalCacheHit(const std::string& key) override; |
@@ -403,7 +403,7 @@ class NET_EXPORT_PRIVATE BackendImpl : public Backend { |
net::NetLog* net_log_; |
Stats stats_; // Usage statistics. |
- scoped_ptr<base::RepeatingTimer> timer_; // Usage timer. |
+ std::unique_ptr<base::RepeatingTimer> timer_; // Usage timer. |
base::WaitableEvent done_; // Signals the end of background work. |
scoped_refptr<TraceObject> trace_object_; // Initializes internal tracing. |
base::WeakPtrFactory<BackendImpl> ptr_factory_; |