Ensure that entries are correctly removed from the MimeHandlerViewContainer map

extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.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 "extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.h"
 
 #include <map>
 #include <set>
 
 #include "content/public/renderer/render_frame.h"
@@ skipping 84 matching lines @@
       weak_factory_(this) {
   DCHECK(!mime_type_.empty());
   is_embedded_ = !render_frame->GetWebFrame()->document().isPluginDocument();
   g_mime_handler_view_container_map.Get()[render_frame].insert(this);
 }
 
 MimeHandlerViewContainer::~MimeHandlerViewContainer() {
   if (loader_)
     loader_->cancel();
 
-  g_mime_handler_view_container_map.Get()[render_frame()].erase(this);
-  if (g_mime_handler_view_container_map.Get()[render_frame()].empty())
-    g_mime_handler_view_container_map.Get().erase(render_frame());
+  if (render_frame()) {
+    g_mime_handler_view_container_map.Get()[render_frame()].erase(this);
+    if (g_mime_handler_view_container_map.Get()[render_frame()].empty())
+      g_mime_handler_view_container_map.Get().erase(render_frame());
+  }
 }
 
 // static
 std::vector<MimeHandlerViewContainer*>
 MimeHandlerViewContainer::FromRenderFrame(content::RenderFrame* render_frame) {
   auto it = g_mime_handler_view_container_map.Get().find(render_frame);
   if (it == g_mime_handler_view_container_map.Get().end())
     return std::vector<MimeHandlerViewContainer*>();
 
   return std::vector<MimeHandlerViewContainer*>(it->second.begin(),
                                                 it->second.end());
 }
 
 void MimeHandlerViewContainer::Ready() {
+  if (!render_frame())
+    return;
+
   blink::WebFrame* frame = render_frame()->GetWebFrame();
   blink::WebURLLoaderOptions options;
   // The embedded plugin is allowed to be cross-origin.
   options.crossOriginRequestPolicy =
       blink::WebURLLoaderOptions::CrossOriginRequestPolicyAllow;
   DCHECK(!loader_);
   loader_.reset(frame->createAssociatedURLLoader(options));
 
   blink::WebURLRequest request(original_url_);
   request.setRequestContext(blink::WebURLRequest::RequestContextObject);
   loader_->loadAsynchronously(request, this);
 }
 
 void MimeHandlerViewContainer::DidFinishLoading() {
   DCHECK(!is_embedded_);
   CreateMimeHandlerViewGuest();
 }
 
+void MimeHandlerViewContainer::OnRenderFrameDestroyed() {
+  g_mime_handler_view_container_map.Get().erase(render_frame());
+}
+
 void MimeHandlerViewContainer::DidReceiveData(const char* data,
                                               int data_length) {
   view_id_ += std::string(data, data_length);
 }
 
 bool MimeHandlerViewContainer::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(MimeHandlerViewContainer, message)
   IPC_MESSAGE_HANDLER(ExtensionMsg_CreateMimeHandlerViewGuestACK,
                       OnCreateMimeHandlerViewGuestACK)
@@ skipping 137 matching lines @@
 
   if (!render_frame())
     return;
 
   render_frame()->Send(new ExtensionHostMsg_CreateMimeHandlerViewGuest(
       render_frame()->GetRoutingID(), view_id_, element_instance_id(),
       element_size_));
 }
 
 }  // namespace extensions