Move Renderer-side NPObject owner tracking to JavaBridgeChannel.

content/renderer/java/java_bridge_dispatcher.cc

 // Copyright (c) 2012 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/java/java_bridge_dispatcher.h"
 
 #include "content/child/child_process.h"
 #include "content/child/npobject_util.h"  // For CreateNPVariant()
 #include "content/common/java_bridge_messages.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "content/renderer/java/java_bridge_channel.h"
 #include "third_party/WebKit/public/web/WebBindings.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 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() {
   if (channel_.get()) {
     return;
   }
 
   IPC::ChannelHandle channel_handle;
   Send(new JavaBridgeHostMsg_GetChannelHandle(routing_id(), &channel_handle));
 
   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() {
   for (ObjectMap::const_iterator iter = objects_.begin();
       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) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(JavaBridgeDispatcher, msg)
     IPC_MESSAGE_HANDLER(JavaBridgeMsg_AddNamedObject, OnAddNamedObject)
     IPC_MESSAGE_HANDLER(JavaBridgeMsg_RemoveNamedObject,
                         OnRemoveNamedObject)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ skipping 53 matching lines @@
   // Removing an object does not unbind it from JavaScript until the window
   // object is next cleared. Note that the browser checks that the named object
   // is present.
   ObjectMap::iterator iter = objects_.find(name);
   DCHECK(iter != objects_.end());
   WebKit::WebBindings::releaseObject(NPVARIANT_TO_OBJECT(iter->second));
   objects_.erase(iter);
 }
 
 }  // namespace content