Remove use of stl_util's STLDeleteContainerPairSecondPointers from content/.

content/browser/storage_partition_impl_map.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/storage_partition_impl_map.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #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"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "content/browser/appcache/appcache_interceptor.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/blob_storage/chrome_blob_storage_context.h"
 #include "content/browser/fileapi/browser_file_system_helper.h"
@@ skipping 341 matching lines @@
     BrowserContext* browser_context)
     : browser_context_(browser_context),
       resource_context_initialized_(false) {
   // Doing here instead of initializer list cause it's just too ugly to read.
   base::SequencedWorkerPool* blocking_pool = BrowserThread::GetBlockingPool();
   file_access_runner_ =
       blocking_pool->GetSequencedTaskRunner(blocking_pool->GetSequenceToken());
 }
 
 StoragePartitionImplMap::~StoragePartitionImplMap() {
-  base::STLDeleteContainerPairSecondPointers(partitions_.begin(),
-                                             partitions_.end());
 }
 
 StoragePartitionImpl* StoragePartitionImplMap::Get(
     const std::string& partition_domain,
     const std::string& partition_name,
     bool in_memory) {
   // Find the previously created partition if it's available.
   StoragePartitionConfig partition_config(
       partition_domain, partition_name, in_memory);
 
   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(
           browser_context_));
 
   ChromeBlobStorageContext* blob_storage_context =
       ChromeBlobStorageContext::GetFor(browser_context_);
   StreamContext* stream_context = StreamContext::GetFor(browser_context_);
   ProtocolHandlerMap protocol_handlers;
   protocol_handlers[url::kBlobScheme] =
@@ skipping 141 matching lines @@
                  file_access_runner_,
                  base::Passed(&active_paths)),
       done);
 }
 
 void StoragePartitionImplMap::ForEach(
     const BrowserContext::StoragePartitionCallback& callback) {
   for (PartitionMap::const_iterator it = partitions_.begin();
        it != partitions_.end();
        ++it) {
-    callback.Run(it->second);
+    callback.Run(it->second.get());
   }
 }
 
 void StoragePartitionImplMap::PostCreateInitialization(
     StoragePartitionImpl* partition,
     bool in_memory) {
   // TODO(ajwong): ResourceContexts no longer have any storage related state.
   // We should move this into a place where it is called once per
   // BrowserContext creation rather than piggybacking off the default context
   // creation.
@@ skipping 32 matching lines @@
 
     // We do not call InitializeURLRequestContext() for media contexts because,
     // other than the HTTP cache, the media contexts share the same backing
     // objects as their associated "normal" request context.  Thus, the previous
     // call serves to initialize the media request context for this storage
     // partition as well.
   }
 }
 
 }  // namespace content