[Android] Fix method invocation and wrappers cleanup handling in Java Bridge

content/content_renderer.gypi

 # 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base',
     '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
     '../cc/cc.gyp:cc',
     '../cc/blink/cc_blink.gyp:cc_blink',
@@ skipping 200 matching lines @@
       'renderer/input/main_thread_input_event_filter.cc',
       'renderer/input/main_thread_input_event_filter.h',
       'renderer/internal_document_state_data.cc',
       'renderer/internal_document_state_data.h',
       'renderer/java/gin_java_bridge_dispatcher.cc',
       'renderer/java/gin_java_bridge_dispatcher.h',
       'renderer/java/gin_java_bridge_object.cc',
       'renderer/java/gin_java_bridge_object.h',
       'renderer/java/gin_java_bridge_value_converter.cc',
       'renderer/java/gin_java_bridge_value_converter.h',
+      'renderer/java/gin_java_function_invocation_helper.cc',
+      'renderer/java/gin_java_function_invocation_helper.h',
       'renderer/manifest/manifest_manager.cc',
       'renderer/manifest/manifest_manager.h',
       'renderer/manifest/manifest_parser.cc',
       'renderer/manifest/manifest_parser.h',
       'renderer/manifest/manifest_uma_util.cc',
       'renderer/manifest/manifest_uma_util.h',
       'renderer/media/aec_dump_message_filter.cc',
       'renderer/media/aec_dump_message_filter.h',
       'renderer/media/android/audio_decoder_android.cc',
       'renderer/media/android/audio_decoder_android.h',
@@ skipping 544 matching lines @@
         '../build/android/cpufeatures.gypi',
       ],
     }, {
       'sources!': [
         'renderer/java/gin_java_bridge_dispatcher.cc',
         'renderer/java/gin_java_bridge_dispatcher.h',
         'renderer/java/gin_java_bridge_object.cc',
         'renderer/java/gin_java_bridge_object.h',
         'renderer/java/gin_java_bridge_value_converter.cc',
         'renderer/java/gin_java_bridge_value_converter.h',
-        'renderer/java/java_bridge_channel.cc',
-        'renderer/java/java_bridge_channel.h',
-        'renderer/java/java_bridge_dispatcher.cc',
-        'renderer/java/java_bridge_dispatcher.h',
+        'renderer/java/gin_java_function_invocation_helper.cc',
+        'renderer/java/gin_java_function_invocation_helper.h',
       ],
     }],
     # TODO(jrg): remove the OS=="android" section?
     # http://crbug.com/113172
     # Understand better how media_stream_ is tied into Chromium.
     ['enable_webrtc==0 and OS=="android"', {
       'sources/': [
         ['exclude', '^renderer/media/media_stream_'],
       ],
     }],
@@ skipping 70 matching lines @@
     }],
   ],
   'target_conditions': [
     ['OS=="android"', {
       'sources/': [
         ['include', '^renderer/render_view_linux\\.cc$'],
       ],
     }],
   ],
 }