Move Renderer-side NPObject owner tracking to JavaBridgeChannel.

content/renderer/java/java_bridge_channel.cc

Index: content/renderer/java/java_bridge_channel.cc
diff --git a/content/renderer/java/java_bridge_channel.cc b/content/renderer/java/java_bridge_channel.cc
index 7d95421fd8868bbd9502baa0bbbd9d6aa1a5687f..235425ab4ff5cb248b88eba1008bc76e14cfbd39 100644
--- a/content/renderer/java/java_bridge_channel.cc
+++ b/content/renderer/java/java_bridge_channel.cc
@@ -7,6 +7,7 @@
 #include "content/child/child_process.h"
 #include "content/child/plugin_messages.h"
 #include "content/common/java_bridge_messages.h"
+#include "third_party/WebKit/public/web/WebBindings.h"
 
 namespace content {
 
@@ -22,10 +23,16 @@ JavaBridgeChannel* JavaBridgeChannel::GetJavaBridgeChannel(
       ChildProcess::current()->GetShutDownEvent()));
 }
 
-JavaBridgeChannel::JavaBridgeChannel() {
+JavaBridgeChannel::JavaBridgeChannel()
+    : peer_owner_id_(new struct _NPP) {
+  // Register the dummy owner Id for our peer (the Browser process) as an object
+  // owner, and have all objects received from the peer owned by it.
+  WebKit::WebBindings::registerObjectOwner(peer_owner_id_.get());
+  SetDefaultNPObjectOwner(peer_owner_id_.get());
 }
 
 JavaBridgeChannel::~JavaBridgeChannel() {
+  WebKit::WebBindings::unregisterObjectOwner(peer_owner_id_.get());
 }
 
 int JavaBridgeChannel::GenerateRouteID() {