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

Unified Diff: net/disk_cache/entry_unittest.cc

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/disk_cache_test_util.cc ('k') | net/disk_cache/memory/mem_backend_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/disk_cache/entry_unittest.cc
diff --git a/net/disk_cache/entry_unittest.cc b/net/disk_cache/entry_unittest.cc
index 22f793bb88bf9b6dbd809721b06e2dea87f71409..3612fab63bfd632254448f65b20c6e242dbc77af 100644
--- a/net/disk_cache/entry_unittest.cc
+++ b/net/disk_cache/entry_unittest.cc
@@ -1625,7 +1625,7 @@ TEST_F(DiskCacheEntryTest, MemoryOnlyEnumerationWithSparseEntries) {
parent_entry->Close();
// Perform the enumerations.
- scoped_ptr<TestIterator> iter = CreateIterator();
+ std::unique_ptr<TestIterator> iter = CreateIterator();
disk_cache::Entry* entry = NULL;
int count = 0;
while (iter->OpenNextEntry(&entry) == net::OK) {
@@ -2185,7 +2185,8 @@ TEST_F(DiskCacheEntryTest, MemoryOnlyDoomSparseEntry) {
// way to simulate a race is to execute what we want on the callback.
class SparseTestCompletionCallback: public net::TestCompletionCallback {
public:
- explicit SparseTestCompletionCallback(scoped_ptr<disk_cache::Backend> cache)
+ explicit SparseTestCompletionCallback(
+ std::unique_ptr<disk_cache::Backend> cache)
: cache_(std::move(cache)) {}
private:
@@ -2194,7 +2195,7 @@ class SparseTestCompletionCallback: public net::TestCompletionCallback {
TestCompletionCallback::SetResult(result);
}
- scoped_ptr<disk_cache::Backend> cache_;
+ std::unique_ptr<disk_cache::Backend> cache_;
DISALLOW_COPY_AND_ASSIGN(SparseTestCompletionCallback);
};
@@ -2351,7 +2352,7 @@ TEST_F(DiskCacheEntryTest, CleanupSparseEntry) {
entry->Close();
EXPECT_EQ(4, cache_->GetEntryCount());
- scoped_ptr<TestIterator> iter = CreateIterator();
+ std::unique_ptr<TestIterator> iter = CreateIterator();
int count = 0;
std::string child_key[2];
while (iter->OpenNextEntry(&entry) == net::OK) {
« no previous file with comments | « net/disk_cache/disk_cache_test_util.cc ('k') | net/disk_cache/memory/mem_backend_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698