[Android] Fix GinJavaBridgeMessageFilter registration issue in Java Bridge.

content/browser/android/java/gin_java_bridge_message_filter.cc

 // Copyright 2015 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_message_filter.h"
 
 #include "base/auto_reset.h"
 #include "content/browser/android/java/gin_java_bridge_dispatcher_host.h"
 #include "content/browser/android/java/java_bridge_thread.h"
 #include "content/common/gin_java_bridge_messages.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 
 #if !defined(OS_ANDROID)
 #error "JavaBridge only supports OS_ANDROID"
 #endif
 
 namespace {
 
 const char kGinJavaBridgeMessageFilterKey[] = "GinJavaBridgeMessageFilter";
 
 }  // namespace
 
 namespace content {
 
 GinJavaBridgeMessageFilter::GinJavaBridgeMessageFilter()
     : BrowserMessageFilter(GinJavaBridgeMsgStart),
-      current_routing_id_(MSG_ROUTING_NONE) {
+      current_routing_id_(MSG_ROUTING_NONE),
+      needs_to_add_filter_for_new_ipc_channel_(false) {
 }
 
 GinJavaBridgeMessageFilter::~GinJavaBridgeMessageFilter() {
 }
 
 void GinJavaBridgeMessageFilter::OnDestruct() const {
   if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     delete this;
   } else {
     BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, this);
@@ skipping 48 matching lines @@
   scoped_refptr<GinJavaBridgeMessageFilter> filter =
       base::UserDataAdapter<GinJavaBridgeMessageFilter>::Get(
           rph, kGinJavaBridgeMessageFilterKey);
   if (!filter && create_if_not_exists) {
     filter = new GinJavaBridgeMessageFilter();
     rph->AddFilter(filter.get());
     rph->SetUserData(kGinJavaBridgeMessageFilterKey,
                      new base::UserDataAdapter<GinJavaBridgeMessageFilter>(
                          filter.get()));
   }
+
+  if (filter.get() && filter->NeedsToAddFilterForNewIpcChannel()) {
+    rph->AddFilter(filter.get());
+    filter->SetNeedsToAddFilterForNewIpcChannel(false);
+  }
+
   return filter;
 }
 
 GinJavaBridgeDispatcherHost* GinJavaBridgeMessageFilter::FindHost() {
   base::AutoLock locker(hosts_lock_);
   auto iter = hosts_.find(current_routing_id_);
   if (iter != hosts_.end())
     return iter->second;
   // Not being able to find a host is OK -- we can receive messages from
   // RenderFrames for which the corresponding host part has already been
@@ skipping 52 matching lines @@
 
 void GinJavaBridgeMessageFilter::OnObjectWrapperDeleted(
     GinJavaBoundObject::ObjectID object_id) {
   DCHECK(JavaBridgeThread::CurrentlyOn());
   GinJavaBridgeDispatcherHost* host = FindHost();
   if (host)
     host->OnObjectWrapperDeleted(current_routing_id_, object_id);
 }
 
 }  // namespace content