Move BrowserPluginDelegate's lifetime mgmt out of content/

components/guest_view/renderer/guest_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 "components/guest_view/renderer/guest_view_container.h"
 
 #include "components/guest_view/common/guest_view_constants.h"
 #include "components/guest_view/common/guest_view_messages.h"
 #include "components/guest_view/renderer/guest_view_request.h"
 #include "content/public/renderer/render_frame.h"
@@ skipping 31 matching lines @@
     : content::RenderFrameObserver(render_frame),
       container_(container) {}
 
 void GuestViewContainer::RenderFrameLifetimeObserver::OnDestruct() {
   container_->RenderFrameDestroyed();
 }
 
 GuestViewContainer::GuestViewContainer(content::RenderFrame* render_frame)
     : element_instance_id_(guest_view::kInstanceIDNone),
       render_frame_(render_frame),
-      ready_(false) {
+      ready_(false),
+      in_destruction_(false) {
   render_frame_lifetime_observer_.reset(
       new RenderFrameLifetimeObserver(this, render_frame_));
 }
 
 GuestViewContainer::~GuestViewContainer() {
   if (element_instance_id() != guest_view::kInstanceIDNone)

[Fady Samuel, 2015/06/05 18:52:33]

Move all work out of the destructor to avoid future usage of the destructor

[lazyboy, 2015/06/05 21:24:01]

Done.

     g_guest_view_container_map.Get().erase(element_instance_id());
 
   if (pending_response_.get())
     pending_response_->ExecuteCallbackIfAvailable(0 /* argc */, nullptr);
 
   while (pending_requests_.size() > 0) {
     linked_ptr<GuestViewRequest> pending_request = pending_requests_.front();
     pending_requests_.pop_front();
     // Call the JavaScript callbacks with no arguments which implies an error.
     pending_request->ExecuteCallbackIfAvailable(0 /* argc */, nullptr);
   }
 }
 
 // static.
 GuestViewContainer* GuestViewContainer::FromID(int element_instance_id) {
   GuestViewContainerMap* guest_view_containers =
       g_guest_view_container_map.Pointer();
   auto it = guest_view_containers->find(element_instance_id);
   return it == guest_view_containers->end() ? nullptr : it->second;
 }
 
+void GuestViewContainer::Destroy() {
+  if (in_destruction_)
+    return;
+
+  in_destruction_ = true;
+  OnDestroy();

[Fady Samuel, 2015/06/05 18:52:33]

Add a comment here that this gives the derived class an opportunity to perform
some cleanup prior to destruction.

[lazyboy, 2015/06/05 21:24:01]

Done.

+
+  delete this;
+}
+
 void GuestViewContainer::RenderFrameDestroyed() {
   OnRenderFrameDestroyed();
   render_frame_ = nullptr;

[Fady Samuel, 2015/06/05 18:52:32]

Call Destroy() here too?

[lazyboy, 2015/06/05 21:24:01]

Done.

 }
 
 void GuestViewContainer::IssueRequest(linked_ptr<GuestViewRequest> request) {
   EnqueueRequest(request);
   PerformPendingRequest();
 }
 
 void GuestViewContainer::EnqueueRequest(linked_ptr<GuestViewRequest> request) {
   pending_requests_.push_back(request);
 }
@@ skipping 46 matching lines @@
 
 void GuestViewContainer::SetElementInstanceID(int element_instance_id) {
   DCHECK_EQ(element_instance_id_, guest_view::kInstanceIDNone);
   element_instance_id_ = element_instance_id;
 
   DCHECK(!g_guest_view_container_map.Get().count(element_instance_id));
   g_guest_view_container_map.Get().insert(
       std::make_pair(element_instance_id, this));
 }
 
+void GuestViewContainer::WillDestroy() {

[Fady Samuel, 2015/06/05 18:52:33]

Call this maybe ElementDestroyed

[lazyboy, 2015/06/05 21:24:01]

Done.

+  OnDestroy();

[Fady Samuel, 2015/06/05 18:52:32]

Destroy()?

[lazyboy, 2015/06/05 21:24:01]

Done.

+}
+
 }  // namespace guest_view