Fix RenderFrameCreated and RenderFrameDeleted WebContentsObserver methods

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 "base/stl_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() {
+  STLDeleteValues(&pending_callbacks_);
 }
 
 ManifestManagerHost::CallbackMap* ManifestManagerHost::GetCallbackMapForFrame(
     RenderFrameHost* render_frame_host) {
   FrameCallbackMap::iterator it = pending_callbacks_.find(render_frame_host);
   return it != pending_callbacks_.end() ? it->second : 0;
 }
 
 void ManifestManagerHost::RenderFrameDeleted(
     RenderFrameHost* render_frame_host) {
@@ skipping 87 matching lines @@
 
   callback->Run(manifest);
   callbacks->Remove(request_id);
   if (callbacks->IsEmpty()) {
     delete callbacks;
     pending_callbacks_.erase(render_frame_host);
   }
 }
 
 } // namespace content