Remove use of stl_util's STLDeleteContainerPairSecondPointers from content/.

content/browser/appcache/appcache.h

 // 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.
 
 #ifndef CONTENT_BROWSER_APPCACHE_APPCACHE_H_
 #define CONTENT_BROWSER_APPCACHE_APPCACHE_H_
 
 #include <stdint.h>
 
 #include <map>
+#include <memory>
 #include <set>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "content/browser/appcache/appcache_database.h"
 #include "content/browser/appcache/appcache_entry.h"
 #include "content/browser/appcache/appcache_manifest_parser.h"
@@ skipping 40 matching lines @@
   // of the new entry with the existing entry. Returns true if a new entry
   // is added, false if the flags are merged into an existing entry.
   bool AddOrModifyEntry(const GURL& url, const AppCacheEntry& entry);
 
   // Removes an entry from the EntryMap, the URL must be in the set.
   void RemoveEntry(const GURL& url);
 
   // Do not store or delete the returned ptr, they're owned by 'this'.
   AppCacheEntry* GetEntry(const GURL& url);
   const AppCacheEntry* GetEntryWithResponseId(int64_t response_id) {
-    return GetEntryAndUrlWithResponseId(response_id, NULL);
+    return GetEntryAndUrlWithResponseId(response_id, nullptr);
   }
   const AppCacheEntry* GetEntryAndUrlWithResponseId(int64_t response_id,
                                                     GURL* optional_url);
   const EntryMap& entries() const { return entries_; }
 
   // The AppCache owns the collection of executable handlers that have
   // been started for this instance. The getter looks up an existing
   // handler returning null if not found, the GetOrCreate method will
   // cons one up if not found.
   // Do not store the returned ptrs, they're owned by 'this'.
@@ skipping 79 matching lines @@
   void set_owning_group(AppCacheGroup* group) { owning_group_ = group; }
 
   // FindResponseForRequest helpers
   const AppCacheNamespace* FindInterceptNamespace(const GURL& url) {
     return FindNamespace(intercept_namespaces_, url);
   }
   const AppCacheNamespace* FindFallbackNamespace(const GURL& url) {
     return FindNamespace(fallback_namespaces_, url);
   }
   bool IsInNetworkNamespace(const GURL& url) {
-    return FindNamespace(online_whitelist_namespaces_, url) != NULL;
+    return FindNamespace(online_whitelist_namespaces_, url) != nullptr;
   }
 
   GURL GetNamespaceEntryUrl(const AppCacheNamespaceVector& namespaces,
                             const GURL& namespace_url) const;
 
   // Use AppCacheHost::Associate*Cache() to manipulate host association.
   void AssociateHost(AppCacheHost* host) {
     associated_hosts_.insert(host);
   }
   void UnassociateHost(AppCacheHost* host);
 
   const int64_t cache_id_;
   scoped_refptr<AppCacheGroup> owning_group_;
   AppCacheHosts associated_hosts_;
 
   EntryMap entries_;    // contains entries of all types
 
   AppCacheNamespaceVector intercept_namespaces_;
   AppCacheNamespaceVector fallback_namespaces_;
   AppCacheNamespaceVector online_whitelist_namespaces_;
   bool online_whitelist_all_;
 
   bool is_complete_;
 
   // when this cache was last updated
   base::Time update_time_;
 
   int64_t cache_size_;
 
-  typedef std::map<int64_t, AppCacheExecutableHandler*> HandlerMap;
+  typedef std::map<int64_t, std::unique_ptr<AppCacheExecutableHandler>>
+      HandlerMap;
   HandlerMap executable_handlers_;
 
   // to notify storage when cache is deleted
   AppCacheStorage* storage_;
 
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheTest, InitializeWithManifest);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheTest, ToFromDatabaseRecords);
   DISALLOW_COPY_AND_ASSIGN(AppCache);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_H_