Ensure we don't leak ObjectProxy objects

content/renderer/pepper/plugin_object.cc

 // Copyright (c) 2011 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/renderer/pepper/plugin_object.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 31 matching lines @@
 
 namespace {
 
 const char kInvalidValueException[] = "Error: Invalid value";
 
 }  // namespace
 
 // PluginObject ----------------------------------------------------------------
 
 PluginObject::~PluginObject() {
-  if (instance_) {
-    ppp_class_->Deallocate(ppp_class_data_);
+  ppp_class_->Deallocate(ppp_class_data_);

[piman, 2016/03/29 18:28:51]

So, in theory, we are not supposed to call back into the plugin after the
instance is deleted. Would it make sense instead to call Deallocate from
PluginObject::InstanceDeleted? Also that way I don't think you need the changes
in ObjectProxy.

+  if (instance_)
     instance_->RemovePluginObject(this);
-  }
 }
 
 // static
 gin::WrapperInfo PluginObject::kWrapperInfo = {gin::kEmbedderNativeGin};
 
 // static
 PluginObject* PluginObject::FromV8Object(v8::Isolate* isolate,
                                          v8::Local<v8::Object> v8_object) {
   PluginObject* plugin_object;
   if (!v8_object.IsEmpty() &&
@@ skipping 231 matching lines @@
     return function_template;
   function_template =
       gin::CreateFunctionTemplate(
           isolate, base::Bind(&PluginObject::Call, weak_factory_.GetWeakPtr(),
                               name));
   template_cache_.Set(name, function_template);
   return function_template;
 }
 
 }  // namespace content