Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Unified Diff: net/disk_cache/blockfile/entry_impl.h

Issue 1894733002: Change scoped_ptr to std::unique_ptr in //net/disk_cache. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/disk_cache/blockfile/disk_cache_perftest.cc ('k') | net/disk_cache/blockfile/entry_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/disk_cache/blockfile/entry_impl.h
diff --git a/net/disk_cache/blockfile/entry_impl.h b/net/disk_cache/blockfile/entry_impl.h
index 336ccc9c8716db6576c50cc0f2efd1586381d344..55f68e7c7c294749bec639aa38b9ed302a7bc4b5 100644
--- a/net/disk_cache/blockfile/entry_impl.h
+++ b/net/disk_cache/blockfile/entry_impl.h
@@ -7,8 +7,9 @@
#include <stdint.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "net/disk_cache/blockfile/disk_format.h"
#include "net/disk_cache/blockfile/storage_block-inl.h"
#include "net/disk_cache/blockfile/storage_block.h"
@@ -277,7 +278,7 @@ class NET_EXPORT_PRIVATE EntryImpl
CacheRankingsBlock node_; // Rankings related information for this entry.
base::WeakPtr<BackendImpl> backend_; // Back pointer to the cache.
base::WeakPtr<InFlightBackendIO> background_queue_; // In-progress queue.
- scoped_ptr<UserBuffer> user_buffers_[kNumStreams]; // Stores user data.
+ std::unique_ptr<UserBuffer> user_buffers_[kNumStreams]; // Stores user data.
// Files to store external user data and key.
scoped_refptr<File> files_[kNumStreams + 1];
mutable std::string key_; // Copy of the key.
@@ -285,7 +286,7 @@ class NET_EXPORT_PRIVATE EntryImpl
bool doomed_; // True if this entry was removed from the cache.
bool read_only_; // True if not yet writing.
bool dirty_; // True if we detected that this is a dirty entry.
- scoped_ptr<SparseControl> sparse_; // Support for sparse entries.
+ std::unique_ptr<SparseControl> sparse_; // Support for sparse entries.
net::BoundNetLog net_log_;
« no previous file with comments | « net/disk_cache/blockfile/disk_cache_perftest.cc ('k') | net/disk_cache/blockfile/entry_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698