Remove stl_util's deletion function use from content/.

content/browser/manifest/manifest_manager_host.cc

Index: content/browser/manifest/manifest_manager_host.cc
diff --git a/content/browser/manifest/manifest_manager_host.cc b/content/browser/manifest/manifest_manager_host.cc
index 699576cc5df496d4ad2390dde2425b00d5680d95..27e68f6003d4335201f21fe48ed4efe6898da22e 100644
--- a/content/browser/manifest/manifest_manager_host.cc
+++ b/content/browser/manifest/manifest_manager_host.cc
@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 
-#include "base/stl_util.h"
+#include "base/memory/ptr_util.h"
 #include "content/common/manifest_manager_messages.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
@@ -32,16 +32,13 @@ ManifestManagerHost::ManifestManagerHost(WebContents* web_contents)
   : WebContentsObserver(web_contents) {
 }
 
-ManifestManagerHost::~ManifestManagerHost() {
-  base::STLDeleteValues(&pending_get_callbacks_);
-}
+ManifestManagerHost::~ManifestManagerHost() {}
 
 ManifestManagerHost::GetCallbackMap*
 ManifestManagerHost::GetCallbackMapForFrame(
     RenderFrameHost* render_frame_host) {
-  FrameGetCallbackMap::iterator it =
-      pending_get_callbacks_.find(render_frame_host);
-  return it != pending_get_callbacks_.end() ? it->second : nullptr;
+  auto it = pending_get_callbacks_.find(render_frame_host);
+  return it != pending_get_callbacks_.end() ? it->second.get() : nullptr;
 }
 
 void ManifestManagerHost::RenderFrameDeleted(
@@ -58,7 +55,6 @@ void ManifestManagerHost::RenderFrameDeleted(
       it.GetCurrentValue()->Run(GURL(), Manifest());
   }
 
-  delete callbacks;
   pending_get_callbacks_.erase(render_frame_host);
 }
 
@@ -67,7 +63,7 @@ void ManifestManagerHost::GetManifest(RenderFrameHost* render_frame_host,
   GetCallbackMap* callbacks = GetCallbackMapForFrame(render_frame_host);
   if (!callbacks) {
     callbacks = new GetCallbackMap();
-    pending_get_callbacks_[render_frame_host] = callbacks;
+    pending_get_callbacks_[render_frame_host] = base::WrapUnique(callbacks);
   }
 
   int request_id = callbacks->Add(new GetManifestCallback(callback));
@@ -151,10 +147,8 @@ void ManifestManagerHost::OnRequestManifestResponse(
 
   callback->Run(manifest_url, manifest);
   callbacks->Remove(request_id);
-  if (callbacks->IsEmpty()) {
-    delete callbacks;
+  if (callbacks->IsEmpty())
     pending_get_callbacks_.erase(render_frame_host);
-  }
 }
 
 } // namespace content