Move Renderer-side NPObject owner tracking to JavaBridgeChannel.

content/browser/renderer_host/java/java_bridge_channel_host.cc

Index: content/browser/renderer_host/java/java_bridge_channel_host.cc
diff --git a/content/browser/renderer_host/java/java_bridge_channel_host.cc b/content/browser/renderer_host/java/java_bridge_channel_host.cc
index 8f53b9d99a866661a5807a1da126acd221692458..6a24086b06175e310025c90cea25f3a445f325c3 100644
--- a/content/browser/renderer_host/java/java_bridge_channel_host.cc
+++ b/content/browser/renderer_host/java/java_bridge_channel_host.cc
@@ -9,6 +9,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "content/common/java_bridge_messages.h"
+#include "third_party/WebKit/public/web/WebBindings.h"
 
 using base::WaitableEvent;
 
@@ -28,7 +29,16 @@ base::LazyInstance<WaitableEvent, WaitableEventLazyInstanceTraits> dummy_event =
 base::subtle::AtomicWord g_last_id = 0;
 }
 
+JavaBridgeChannelHost::JavaBridgeChannelHost()
+    : peer_owner_id_(new struct _NPP) {
+  // Register a dummy owner Id for objects received from the peer Renderer
+  // process.
+  WebKit::WebBindings::registerObjectOwner(peer_owner_id_.get());
+  SetDefaultNPObjectOwner(peer_owner_id_.get());
+}
+
 JavaBridgeChannelHost::~JavaBridgeChannelHost() {
+  WebKit::WebBindings::unregisterObjectOwner(peer_owner_id_.get());
 #if defined(OS_POSIX)
   if (channel_handle_.socket.fd > 0) {
     close(channel_handle_.socket.fd);