Move BrowserPluginDelegate's lifetime mgmt out of content/

extensions/renderer/guest_view/guest_view_internal_custom_bindings.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/guest_view_internal_custom_bindings.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 29 matching lines @@
 
 GuestViewInternalCustomBindings::GuestViewInternalCustomBindings(
     ScriptContext* context)
     : ObjectBackedNativeHandler(context) {
   RouteFunction("AttachGuest",
                 base::Bind(&GuestViewInternalCustomBindings::AttachGuest,
                            base::Unretained(this)));
   RouteFunction("DetachGuest",
                 base::Bind(&GuestViewInternalCustomBindings::DetachGuest,
                            base::Unretained(this)));
+  RouteFunction("DestroyContainer",
+                base::Bind(&GuestViewInternalCustomBindings::DestroyContainer,
+                           base::Unretained(this)));
   RouteFunction("GetContentWindow",
                 base::Bind(&GuestViewInternalCustomBindings::GetContentWindow,
                            base::Unretained(this)));
   RouteFunction("GetViewFromID",
                 base::Bind(&GuestViewInternalCustomBindings::GetViewFromID,
                            base::Unretained(this)));
   RouteFunction(
       "RegisterDestructionCallback",
       base::Bind(&GuestViewInternalCustomBindings::RegisterDestructionCallback,
                  base::Unretained(this)));
@@ skipping 107 matching lines @@
   linked_ptr<guest_view::GuestViewRequest> request(
       new guest_view::GuestViewDetachRequest(
           guest_view_container, args.Length() == 2 ? args[1].As<v8::Function>()
                                                    : v8::Local<v8::Function>(),
           args.GetIsolate()));
   guest_view_container->IssueRequest(request);
 
   args.GetReturnValue().Set(v8::Boolean::New(context()->isolate(), true));
 }
 
+void GuestViewInternalCustomBindings::DestroyContainer(
+    const v8::FunctionCallbackInfo<v8::Value>& args) {
+  args.GetReturnValue().SetNull();
+
+  if (args.Length() != 1)
+    return;
+
+  // Element Instance ID.
+  if (!args[0]->IsInt32())
+    return;
+
+  int element_instance_id = args[0]->Int32Value();
+  auto* guest_view_container =
+      guest_view::GuestViewContainer::FromID(element_instance_id);
+  if (!guest_view_container)
+    return;
+
+  delete guest_view_container;

[Fady Samuel, 2015/06/05 15:10:42]

Let's make sure that GuestViewContainer destruction happens in one place. The
idiom is as follows:

1. Please make GuestViewContainer's destructor private and introduce a Destroy()
method.
2. Make sure that method cannot be called reentrantly by introducing a flag to
check if we're in destruction.
3. Call all virtual methods from there.
4. Clear the weak ptr factory.
5. delete this.

[lazyboy, 2015/06/05 16:56:55]

GuestViewContainer's destructor is now protected.
Added in_destruction_ bool
Done.
There are no weak ptr factory for these containers, so no-op?
Done.

+}
+
 void GuestViewInternalCustomBindings::GetContentWindow(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   // Default to returning null.
   args.GetReturnValue().SetNull();
 
   if (args.Length() != 1)
     return;
 
   // The routing ID for the RenderView.
   if (!args[0]->IsInt32())
@@ skipping 106 matching lines @@
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   // Gesture is required to request fullscreen.
   blink::WebScopedUserGesture user_gesture;
   CHECK_EQ(args.Length(), 1);
   CHECK(args[0]->IsFunction());
   v8::Local<v8::Value> no_args;
   context()->CallFunction(v8::Local<v8::Function>::Cast(args[0]), 0, &no_args);
 }
 
 }  // namespace extensions