| Index: content/browser/storage_partition_impl_map.cc
|
| diff --git a/content/browser/storage_partition_impl_map.cc b/content/browser/storage_partition_impl_map.cc
|
| index 83360f39a83cd97187856d510c3322e4fd735a04..58852c2f26fe605739d42f4433f220092e2eeb14 100644
|
| --- a/content/browser/storage_partition_impl_map.cc
|
| +++ b/content/browser/storage_partition_impl_map.cc
|
| @@ -94,7 +94,7 @@ class BlobProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
|
| const scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
|
| const scoped_refptr<StreamContext> stream_context_;
|
| const scoped_refptr<storage::FileSystemContext> file_system_context_;
|
| - mutable scoped_ptr<storage::BlobProtocolHandler> blob_protocol_handler_;
|
| + mutable std::unique_ptr<storage::BlobProtocolHandler> blob_protocol_handler_;
|
| DISALLOW_COPY_AND_ASSIGN(BlobProtocolHandler);
|
| };
|
|
|
| @@ -313,7 +313,7 @@ void NormalizeActivePaths(const base::FilePath& storage_root,
|
| void BlockingGarbageCollect(
|
| const base::FilePath& storage_root,
|
| const scoped_refptr<base::TaskRunner>& file_access_runner,
|
| - scoped_ptr<base::hash_set<base::FilePath> > active_paths) {
|
| + std::unique_ptr<base::hash_set<base::FilePath>> active_paths) {
|
| CHECK(storage_root.IsAbsolute());
|
|
|
| NormalizeActivePaths(storage_root, active_paths.get());
|
| @@ -533,7 +533,7 @@ void StoragePartitionImplMap::AsyncObliterate(
|
| }
|
|
|
| void StoragePartitionImplMap::GarbageCollect(
|
| - scoped_ptr<base::hash_set<base::FilePath> > active_paths,
|
| + std::unique_ptr<base::hash_set<base::FilePath>> active_paths,
|
| const base::Closure& done) {
|
| // Include all paths for current StoragePartitions in the active_paths since
|
| // they cannot be deleted safely.
|
|
|