Skip to content

Commit

Permalink
quota: Replace bare new with make_unique in QuotaManager.
Browse files Browse the repository at this point in the history
Change-Id: I05361bb4ff2ebf09ef6dfda03b60922b9418264c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2225860
Reviewed-by: Jarryd Goodman <jarrydg@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#773934}
  • Loading branch information
pwnall authored and Commit Bot committed Jun 2, 2020
1 parent cb9fec7 commit fea1aa9
Showing 1 changed file with 17 additions and 16 deletions.
33 changes: 17 additions & 16 deletions storage/browser/quota/quota_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1215,16 +1215,16 @@ bool QuotaManager::ResetUsageTracker(StorageType type) {
return false;
switch (type) {
case StorageType::kTemporary:
temporary_usage_tracker_.reset(new UsageTracker(
clients_, StorageType::kTemporary, special_storage_policy_.get()));
temporary_usage_tracker_ = std::make_unique<UsageTracker>(
clients_, StorageType::kTemporary, special_storage_policy_.get());
return true;
case StorageType::kPersistent:
persistent_usage_tracker_.reset(new UsageTracker(
clients_, StorageType::kPersistent, special_storage_policy_.get()));
persistent_usage_tracker_ = std::make_unique<UsageTracker>(
clients_, StorageType::kPersistent, special_storage_policy_.get());
return true;
case StorageType::kSyncable:
syncable_usage_tracker_.reset(new UsageTracker(
clients_, StorageType::kSyncable, special_storage_policy_.get()));
syncable_usage_tracker_ = std::make_unique<UsageTracker>(
clients_, StorageType::kSyncable, special_storage_policy_.get());
return true;
default:
NOTREACHED();
Expand Down Expand Up @@ -1254,15 +1254,16 @@ void QuotaManager::LazyInitialize() {
}

// Use an empty path to open an in-memory only databse for incognito.
database_.reset(new QuotaDatabase(is_incognito_ ? base::FilePath() :
profile_path_.AppendASCII(kDatabaseName)));
database_ = std::make_unique<QuotaDatabase>(
is_incognito_ ? base::FilePath()
: profile_path_.AppendASCII(kDatabaseName));

temporary_usage_tracker_.reset(new UsageTracker(
clients_, StorageType::kTemporary, special_storage_policy_.get()));
persistent_usage_tracker_.reset(new UsageTracker(
clients_, StorageType::kPersistent, special_storage_policy_.get()));
syncable_usage_tracker_.reset(new UsageTracker(
clients_, StorageType::kSyncable, special_storage_policy_.get()));
temporary_usage_tracker_ = std::make_unique<UsageTracker>(
clients_, StorageType::kTemporary, special_storage_policy_.get());
persistent_usage_tracker_ = std::make_unique<UsageTracker>(
clients_, StorageType::kPersistent, special_storage_policy_.get());
syncable_usage_tracker_ = std::make_unique<UsageTracker>(
clients_, StorageType::kSyncable, special_storage_policy_.get());

if (!is_incognito_) {
histogram_timer_.Start(
Expand Down Expand Up @@ -1409,8 +1410,8 @@ void QuotaManager::StartEviction() {
DCHECK(!temporary_storage_evictor_.get());
if (eviction_disabled_)
return;
temporary_storage_evictor_.reset(new QuotaTemporaryStorageEvictor(
this, kEvictionIntervalInMilliSeconds));
temporary_storage_evictor_ = std::make_unique<QuotaTemporaryStorageEvictor>(
this, kEvictionIntervalInMilliSeconds);
temporary_storage_evictor_->Start();
}

Expand Down

0 comments on commit fea1aa9

Please sign in to comment.