Move Renderer-side NPObject owner tracking to JavaBridgeChannel.

content/browser/renderer_host/java/java_bridge_channel_host.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/browser/renderer_host/java/java_bridge_channel_host.h"
 
 #include "base/atomicops.h"
 #include "base/lazy_instance.h"
 #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;
 
 namespace content {
 namespace {
 struct WaitableEventLazyInstanceTraits
     : public base::DefaultLazyInstanceTraits<WaitableEvent> {
   static WaitableEvent* New(void* instance) {
     // Use placement new to initialize our instance in our preallocated space.
     // The parenthesis is very important here to force POD type initialization.
     return new (instance) WaitableEvent(false, false);
   }
 };
 base::LazyInstance<WaitableEvent, WaitableEventLazyInstanceTraits> dummy_event =
     LAZY_INSTANCE_INITIALIZER;
 
 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);
   }
 #endif
 }
 
 JavaBridgeChannelHost* JavaBridgeChannelHost::GetJavaBridgeChannelHost(
     int renderer_id,
     base::MessageLoopProxy* ipc_message_loop) {
@@ skipping 44 matching lines @@
     IPC_MESSAGE_HANDLER(JavaBridgeMsg_GenerateRouteID, OnGenerateRouteID)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void JavaBridgeChannelHost::OnGenerateRouteID(int* route_id) {
   *route_id = GenerateRouteID();
 }
 
 }  // namespace content