Remove use of stl_util's STLDeleteContainerPairSecondPointers from content/.

content/browser/appcache/appcache_storage.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_STORAGE_H_
 #define CONTENT_BROWSER_APPCACHE_APPCACHE_STORAGE_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 257 matching lines @@
     void OnReadComplete(int result);
 
     AppCacheStorage* storage_;
     GURL manifest_url_;
     int64_t response_id_;
     std::unique_ptr<AppCacheResponseReader> reader_;
     DelegateReferenceVector delegates_;
     scoped_refptr<HttpResponseInfoIOBuffer> info_buffer_;
   };
 
-  typedef std::map<int64_t, ResponseInfoLoadTask*> PendingResponseInfoLoads;
-
   DelegateReference* GetDelegateReference(Delegate* delegate) {
     DelegateReferenceMap::iterator iter =
         delegate_references_.find(delegate);
     if (iter != delegate_references_.end())
       return iter->second;
     return NULL;
   }
 
   DelegateReference* GetOrCreateDelegateReference(Delegate* delegate) {
     DelegateReference* reference = GetDelegateReference(delegate);
     if (reference)
       return reference;
     return new DelegateReference(delegate, this);
   }
 
   ResponseInfoLoadTask* GetOrCreateResponseInfoLoadTask(
       const GURL& manifest_url,
       int64_t response_id) {
-    PendingResponseInfoLoads::iterator iter =
-        pending_info_loads_.find(response_id);
+    auto iter = pending_info_loads_.find(response_id);
     if (iter != pending_info_loads_.end())
-      return iter->second;
+      return iter->second.get();
     return new ResponseInfoLoadTask(manifest_url, response_id, this);
   }
 
   // Should only be called when creating a new response writer.
   int64_t NewResponseId() { return ++last_response_id_; }
 
   // Helpers to query and notify the QuotaManager.
   void UpdateUsageMapAndNotify(const GURL& origin, int64_t new_usage);
   void ClearUsageMapAndNotify();
   void NotifyStorageAccessed(const GURL& origin);
 
   // The last storage id used for different object types.
   int64_t last_cache_id_;
   int64_t last_group_id_;
   int64_t last_response_id_;
 
   UsageMap usage_map_;  // maps origin to usage
   AppCacheWorkingSet working_set_;
   AppCacheServiceImpl* service_;
   DelegateReferenceMap delegate_references_;
-  PendingResponseInfoLoads pending_info_loads_;
+
+  // Note that the ResponseInfoLoadTask items add themselves to this map.
+  std::map<int64_t, std::unique_ptr<ResponseInfoLoadTask>> pending_info_loads_;
 
   // The set of last ids must be retrieved from storage prior to being used.
   static const int64_t kUnitializedId;
 
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheStorageTest, DelegateReferences);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheStorageTest, UsageMap);
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheStorage);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_STORAGE_H_