[Android] Fix GinJavaBridgeMessageFilter registration issue in Java Bridge.

content/browser/android/java/gin_java_bridge_dispatcher_host.cc

 // Copyright 2014 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/android/java/gin_java_bridge_dispatcher_host.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #include "content/browser/android/java/gin_java_bound_object_delegate.h"
 #include "content/browser/android/java/gin_java_bridge_message_filter.h"
@@ skipping 61 matching lines @@
   }
 }
 
 void GinJavaBridgeDispatcherHost::WebContentsDestroyed() {
   scoped_refptr<GinJavaBridgeMessageFilter> filter =
       GinJavaBridgeMessageFilter::FromHost(this, false);
   if (filter)
     filter->RemoveHost(this);
 }
 
+void GinJavaBridgeDispatcherHost::RenderProcessGone(
+    base::TerminationStatus status) {
+  scoped_refptr<GinJavaBridgeMessageFilter> filter =

[mnaganov (inactive), 2015/12/28 19:00:17]

A simpler approach is to remove the user data from the associated
RenderProcessHost. This way a new filter will be created and added for the new
channel automatically when needed.

[Pritam Nikam, 2015/12/29 11:24:46]

Done.

+      GinJavaBridgeMessageFilter::FromHost(this, false);
+  if (filter)
+    filter->SetNeedsToAddFilterForNewIpcChannel(true);
+}
+
+void GinJavaBridgeDispatcherHost::RenderViewHostChanged(
+    RenderViewHost* old_host,
+    RenderViewHost* new_host) {
+  scoped_refptr<GinJavaBridgeMessageFilter> filter =
+      GinJavaBridgeMessageFilter::FromHost(this, false);
+  if (!filter)
+    InstallFilterAndRegisterAllRoutingIds();
+}
+
 GinJavaBoundObject::ObjectID GinJavaBridgeDispatcherHost::AddObject(
     const base::android::JavaRef<jobject>& object,
     const base::android::JavaRef<jclass>& safe_annotation_clazz,
     bool is_named,
     int32 holder) {
   // Can be called on any thread. Calls come from the UI thread via
   // AddNamedObject, and from the background thread, when injected Java
   // object's method returns a Java object.
   DCHECK(is_named || holder);
   JNIEnv* env = base::android::AttachCurrentThread();
@@ skipping 266 matching lines @@
   if (iter == objects_.end())
     return;
   JavaObjectWeakGlobalRef ref =
       RemoveHolderAndAdvanceLocked(routing_id, &iter);
   if (!ref.is_empty()) {
     RemoveFromRetainedObjectSetLocked(ref);
   }
 }
 
 }  // namespace content