Remove stl_util's deletion function use from content/.

content/browser/manifest/manifest_manager_host.cc

 // Copyright 2014 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/manifest/manifest_manager_host.h"
 
 #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"
 #include "content/public/common/manifest.h"
 #include "content/public/common/result_codes.h"
 
 namespace content {
 
 namespace {
 
 void KillRenderer(RenderFrameHost* render_frame_host) {
   base::ProcessHandle process_handle =
       render_frame_host->GetProcess()->GetHandle();
   if (process_handle == base::kNullProcessHandle)
     return;
   render_frame_host->GetProcess()->Shutdown(RESULT_CODE_KILLED_BAD_MESSAGE,
                                             false);
 }
 
 } // anonymous namespace
 
 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(
     RenderFrameHost* render_frame_host) {
   GetCallbackMap* callbacks = GetCallbackMapForFrame(render_frame_host);
   if (!callbacks)
     return;
 
   // Call the callbacks with a failure state before deleting them. Do this in
   // a block so the iterator is destroyed before |callbacks|.
   {
     GetCallbackMap::const_iterator it(callbacks);
     for (; !it.IsAtEnd(); it.Advance())
       it.GetCurrentValue()->Run(GURL(), Manifest());
   }
 
-  delete callbacks;
   pending_get_callbacks_.erase(render_frame_host);
 }
 
 void ManifestManagerHost::GetManifest(RenderFrameHost* render_frame_host,
                                       const GetManifestCallback& callback) {
   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));
 
   render_frame_host->Send(new ManifestManagerMsg_RequestManifest(
       render_frame_host->GetRoutingID(), request_id));
 }
 
 bool ManifestManagerHost::OnMessageReceived(
     const IPC::Message& message, RenderFrameHost* render_frame_host) {
@@ skipping 63 matching lines @@
   // any value outside the range of a 32 bit integer is invalid.
   if (manifest.theme_color < std::numeric_limits<int32_t>::min() ||
       manifest.theme_color > std::numeric_limits<int32_t>::max())
     manifest.theme_color = Manifest::kInvalidOrMissingColor;
   if (manifest.background_color < std::numeric_limits<int32_t>::min() ||
       manifest.background_color > std::numeric_limits<int32_t>::max())
     manifest.background_color = Manifest::kInvalidOrMissingColor;
 
   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