| Index: net/disk_cache/blockfile/index_table_v3_unittest.cc
|
| diff --git a/net/disk_cache/blockfile/index_table_v3_unittest.cc b/net/disk_cache/blockfile/index_table_v3_unittest.cc
|
| index e2fca1063e4b6d5b8664ef95114c97898d42cfa2..52251f5221b69564e224d1263d5c0157ffca7cd5 100644
|
| --- a/net/disk_cache/blockfile/index_table_v3_unittest.cc
|
| +++ b/net/disk_cache/blockfile/index_table_v3_unittest.cc
|
| @@ -63,9 +63,9 @@ class TestCacheTables {
|
| base::Time start_time() const { return start_time_; }
|
|
|
| private:
|
| - scoped_ptr<uint64_t[]> main_bitmap_;
|
| - scoped_ptr<disk_cache::IndexBucket[]> main_table_;
|
| - scoped_ptr<disk_cache::IndexBucket[]> extra_table_;
|
| + std::unique_ptr<uint64_t[]> main_bitmap_;
|
| + std::unique_ptr<disk_cache::IndexBucket[]> main_table_;
|
| + std::unique_ptr<disk_cache::IndexBucket[]> extra_table_;
|
| base::Time start_time_;
|
| int num_bitmap_bytes_;
|
|
|
| @@ -580,13 +580,13 @@ TEST(DiskCacheIndexTable, Iterations) {
|
| TEST(DiskCacheIndexTable, Doubling) {
|
| IndexTable index(NULL);
|
| int size = 1024;
|
| - scoped_ptr<TestCacheTables> cache(new TestCacheTables(size));
|
| + std::unique_ptr<TestCacheTables> cache(new TestCacheTables(size));
|
| int entry_id = 0;
|
| disk_cache::CellList entries;
|
|
|
| // Go from 1024 to 256k cells.
|
| for (int resizes = 0; resizes <= 8; resizes++) {
|
| - scoped_ptr<TestCacheTables> old_cache(std::move(cache));
|
| + std::unique_ptr<TestCacheTables> old_cache(std::move(cache));
|
| cache.reset(new TestCacheTables(size));
|
| cache.get()->CopyFrom(*old_cache.get());
|
|
|
| @@ -621,7 +621,7 @@ TEST(DiskCacheIndexTable, Doubling) {
|
| TEST(DiskCacheIndexTable, BucketChains) {
|
| IndexTable index(NULL);
|
| int size = 1024;
|
| - scoped_ptr<TestCacheTables> cache(new TestCacheTables(size));
|
| + std::unique_ptr<TestCacheTables> cache(new TestCacheTables(size));
|
| disk_cache::CellList entries;
|
|
|
| IndexTableInitData init_data;
|
| @@ -641,7 +641,7 @@ TEST(DiskCacheIndexTable, BucketChains) {
|
| }
|
|
|
| // Double the size.
|
| - scoped_ptr<TestCacheTables> old_cache(std::move(cache));
|
| + std::unique_ptr<TestCacheTables> old_cache(std::move(cache));
|
| cache.reset(new TestCacheTables(size * 2));
|
| cache.get()->CopyFrom(*old_cache.get());
|
|
|
|
|