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

Unified Diff: content/browser/storage_partition_impl_map.cc

Issue 2249473002: Remove use of stl_util's STLDeleteContainerPairSecondPointers from content/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 4 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 | « content/browser/storage_partition_impl_map.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c46b9590770979fed04947819bddd49d026a3c52..0e85d8a6238f7fab568733139fc376d4fcbf04a0 100644
--- a/content/browser/storage_partition_impl_map.cc
+++ b/content/browser/storage_partition_impl_map.cc
@@ -15,7 +15,6 @@
#include "base/location.h"
#include "base/macros.h"
#include "base/single_thread_task_runner.h"
-#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
@@ -377,8 +376,6 @@ StoragePartitionImplMap::StoragePartitionImplMap(
}
StoragePartitionImplMap::~StoragePartitionImplMap() {
- base::STLDeleteContainerPairSecondPointers(partitions_.begin(),
- partitions_.end());
}
StoragePartitionImpl* StoragePartitionImplMap::Get(
@@ -391,14 +388,16 @@ StoragePartitionImpl* StoragePartitionImplMap::Get(
PartitionMap::const_iterator it = partitions_.find(partition_config);
if (it != partitions_.end())
- return it->second;
+ return it->second.get();
base::FilePath relative_partition_path =
GetStoragePartitionPath(partition_domain, partition_name);
- StoragePartitionImpl* partition = StoragePartitionImpl::Create(
- browser_context_, in_memory, relative_partition_path);
- partitions_[partition_config] = partition;
+ std::unique_ptr<StoragePartitionImpl> partition_ptr(
+ StoragePartitionImpl::Create(browser_context_, in_memory,
+ relative_partition_path));
+ StoragePartitionImpl* partition = partition_ptr.get();
+ partitions_[partition_config] = std::move(partition_ptr);
partition->GetQuotaManager()->SetTemporaryStorageEvictionPolicy(
GetContentClient()->browser()->GetTemporaryStorageEvictionPolicy(
@@ -560,7 +559,7 @@ void StoragePartitionImplMap::ForEach(
for (PartitionMap::const_iterator it = partitions_.begin();
it != partitions_.end();
++it) {
- callback.Run(it->second);
+ callback.Run(it->second.get());
}
}
« no previous file with comments | « content/browser/storage_partition_impl_map.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698