Move Renderer-side NPObject owner tracking to JavaBridgeChannel.

content/renderer/java/java_bridge_dispatcher.cc

Index: content/renderer/java/java_bridge_dispatcher.cc
diff --git a/content/renderer/java/java_bridge_dispatcher.cc b/content/renderer/java/java_bridge_dispatcher.cc
index af899a0503576c309b75484931195152f9e8b503..c0b599454eec8996f68dbfa81d13335dedeac82c 100644
--- a/content/renderer/java/java_bridge_dispatcher.cc
+++ b/content/renderer/java/java_bridge_dispatcher.cc
@@ -18,8 +18,7 @@
 namespace content {
 
 JavaBridgeDispatcher::JavaBridgeDispatcher(RenderView* render_view)
-    : RenderViewObserver(render_view), owner_id_(new struct _NPP) {
-  WebKit::WebBindings::registerObjectOwner(owner_id_.get());
+    : RenderViewObserver(render_view) {
 }
 
 void JavaBridgeDispatcher::EnsureChannelIsSetUp() {
@@ -32,10 +31,6 @@ void JavaBridgeDispatcher::EnsureChannelIsSetUp() {
 
   channel_ = JavaBridgeChannel::GetJavaBridgeChannel(
       channel_handle, ChildProcess::current()->io_message_loop_proxy());
-
-  // All objects received from the Browser process belong to us.
-  if (channel_.get())
-    channel_->SetDefaultNPObjectOwner(owner_id_.get());
 }
 
 JavaBridgeDispatcher::~JavaBridgeDispatcher() {
@@ -43,8 +38,6 @@ JavaBridgeDispatcher::~JavaBridgeDispatcher() {
       iter != objects_.end(); ++iter) {
     WebKit::WebBindings::releaseObject(NPVARIANT_TO_OBJECT(iter->second));
   }
-
-  WebKit::WebBindings::unregisterObjectOwner(owner_id_.get());
 }
 
 bool JavaBridgeDispatcher::OnMessageReceived(const IPC::Message& msg) {