Move BrowserPluginDelegate's lifetime mgmt out of content/

extensions/renderer/guest_view/extensions_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 "extensions/renderer/guest_view/extensions_guest_view_container.h"
 
 #include "content/public/renderer/render_frame.h"
 #include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace extensions {
 
 ExtensionsGuestViewContainer::ExtensionsGuestViewContainer(
     content::RenderFrame* render_frame)
     : GuestViewContainer(render_frame),
       destruction_isolate_(nullptr),
       element_resize_isolate_(nullptr),
       weak_ptr_factory_(this) {
 }
 
 ExtensionsGuestViewContainer::~ExtensionsGuestViewContainer() {
+}
+
+void ExtensionsGuestViewContainer::OnDestroy() {
   // Call the destruction callback, if one is registered.
   if (!destruction_callback_.IsEmpty()) {
     v8::HandleScope handle_scope(destruction_isolate_);
     v8::Local<v8::Function> callback = v8::Local<v8::Function>::New(
         destruction_isolate_, destruction_callback_);
     v8::Local<v8::Context> context = callback->CreationContext();
     if (context.IsEmpty())
       return;
 
     v8::Context::Scope context_scope(context);
     blink::WebScopedMicrotaskSuppression suppression;
 
     callback->Call(context->Global(), 0 /* argc */, nullptr);
+
+    destruction_callback_.Reset();

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

This shouldn't be necessary.

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

Done.

   }
 }
 
 void ExtensionsGuestViewContainer::RegisterDestructionCallback(
     v8::Local<v8::Function> callback,
     v8::Isolate* isolate) {
   destruction_callback_.Reset(isolate, callback);
   destruction_isolate_ = isolate;
 }
 
@@ skipping 29 matching lines @@
       v8::Integer::New(element_resize_isolate_, new_size.width()),
       v8::Integer::New(element_resize_isolate_, new_size.height())};
 
   v8::Context::Scope context_scope(context);
   blink::WebScopedMicrotaskSuppression suppression;
 
   callback->Call(context->Global(), argc, argv);
 }
 
 }  // namespace extensions