Move Renderer-side NPObject owner tracking to JavaBridgeChannel.

content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.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/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_helper.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/renderer_host/java/java_bound_object.h"
 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host.h"
 #include "content/common/android/hash_set.h"
 #include "content/public/browser/browser_thread.h"
 #include "third_party/WebKit/public/web/WebBindings.h"
 
 namespace content {
 
 JavaBridgeDispatcherHostManager::JavaBridgeDispatcherHostManager(
     WebContents* web_contents)
-    : WebContentsObserver(web_contents) {
+    : WebContentsObserver(web_contents),
+      object_owner_id_(new struct _NPP) {
+  // Register a dummy owner Id for JavaBoundObject instances.
+  WebKit::WebBindings::registerObjectOwner(object_owner_id_.get());
 }
 
 JavaBridgeDispatcherHostManager::~JavaBridgeDispatcherHostManager() {
   for (ObjectMap::iterator iter = objects_.begin(); iter != objects_.end();
       ++iter) {
     WebKit::WebBindings::releaseObject(iter->second);
   }
   DCHECK_EQ(0U, instances_.size());
+
+  WebKit::WebBindings::unregisterObjectOwner(object_owner_id_.get());
 }
 
 void JavaBridgeDispatcherHostManager::AddNamedObject(const string16& name,
                                                      NPObject* object) {
   // Record this object in a map so that we can add it into RenderViewHosts
   // created later. The JavaBridgeDispatcherHost instances will take a
   // reference to the object, but we take one too, because this method can be
   // called before there are any such instances.
   WebKit::WebBindings::retainObject(object);
   objects_[name] = object;
@@ skipping 105 matching lines @@
 
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jobject> retained_object_set =
       retained_object_set_.get(env);
   if (!retained_object_set.is_null()) {
     JNI_Java_HashSet_remove(env, retained_object_set, object);
   }
 }
 
 }  // namespace content