content_shell: Move BrowserTestSystemMessageHandler and use it in layout tests for Android

content/content_tests.gypi

 # Copyright (c) 2013 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.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
@@ skipping 31 matching lines @@
         'public/test/mock_download_manager.cc',
         'public/test/mock_download_manager.h',
         'public/test/mock_notification_observer.cc',
         'public/test/mock_notification_observer.h',
         'public/test/mock_render_process_host.cc',
         'public/test/mock_render_process_host.h',
         'public/test/mock_render_thread.cc',
         'public/test/mock_render_thread.h',
         'public/test/mock_resource_context.cc',
         'public/test/mock_resource_context.h',
+        'public/test/nested_message_pump_android.cc',
+        'public/test/nested_message_pump_android.h',
         'public/test/render_view_fake_resources_test.cc',
         'public/test/render_view_fake_resources_test.h',
         'public/test/render_view_test.cc',
         'public/test/render_view_test.h',
         'public/test/render_widget_test.cc',
         'public/test/render_widget_test.h',
         'public/test/test_browser_context.cc',
         'public/test/test_browser_context.h',
         'public/test/test_browser_thread_bundle.cc',
         'public/test/test_browser_thread_bundle.h',
@@ skipping 162 matching lines @@
         ['OS=="win"', {
           'dependencies': [
             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
           ],
         }],
         ['OS!="android" and OS!="ios"', {
           'dependencies': [
             '../third_party/libvpx/libvpx.gyp:libvpx',
           ],
         }],
+        ['OS=="android"', {
+          'dependencies': [
+            'test_support_content_jni_headers',
+          ],
+        }],
       ],
     },
     {
       'target_name': 'content_unittests',
       'type': '<(gtest_target_type)',
       'defines!': ['CONTENT_IMPLEMENTATION'],
       'dependencies': [
         'content_browser',
         'content_common',
         'test_support_content',
@@ skipping 593 matching lines @@
             'renderer/pepper/pepper_graphics_2d_host_unittest.cc',
             'renderer/pepper/pepper_url_request_unittest.cc',
             'renderer/render_thread_impl_browsertest.cc',
             'renderer/render_view_browsertest.cc',
             'renderer/render_view_browsertest_mac.mm',
             'renderer/render_widget_browsertest.cc',
             'renderer/resource_fetcher_browsertest.cc',
             'renderer/savable_resources_browsertest.cc',
             'test/accessibility_browser_test_utils.cc',
             'test/accessibility_browser_test_utils.h',
-            'test/browser_test_message_pump_android.cc',
-            'test/browser_test_message_pump_android.h',
             'test/content_browser_test.h',
             'test/content_browser_test.cc',
             'test/content_browser_test_utils.cc',
             'test/content_browser_test_utils.h',
             'test/content_browser_test_utils_mac.mm',
             'test/content_browser_test_test.cc',
             'test/content_test_launcher.cc',
             '../webkit/plugins/ppapi/mock_platform_image_2d.cc',
             '../webkit/plugins/ppapi/mock_platform_image_2d.h',
             '../webkit/plugins/ppapi/mock_plugin_delegate.cc',
@@ skipping 267 matching lines @@
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_unittests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
         {
           'target_name': 'content_browsertests_apk',
           'type': 'none',
           'dependencies': [
             'content_browsertests',
             'content_java',
+            'content_java_test_support',
             'content_shell_java',
           ],
           'variables': {
             'apk_name': 'content_browsertests',
             'java_in_dir': 'shell/android/browsertests_apk',
             'resource_dir': 'shell/android/browsertests_apk/res',
             'native_lib_target': 'libcontent_browsertests',
             'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
             'asset_location': '<(ant_build_out)/content_shell/assets',
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
           'target_name': 'video_decode_accelerator_unittest_apk',
           'type': 'none',
           'dependencies': [
             'video_decode_accelerator_unittest',
           ],
           'variables': {
             'test_suite_name': 'video_decode_accelerator_unittest',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_unittests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
     ['OS == "android"', {
       'targets': [
         {
+          'target_name': 'test_support_content_jni_headers',
+          'type': 'none',
+          'sources': [
+            'public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java',
+          ],
+          'direct_dependent_settings': {
+            'include_dirs': [
+              '<(SHARED_INTERMEDIATE_DIR)/content/public/test',
+            ],
+          },
+          'variables': {
+            'jni_gen_package': 'content/public/test',
+          },
+          'includes': [ '../build/jni_generator.gypi' ],
+        },
+        {
           'target_name': 'content_java_test_support',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_java_test_support',
             'content_common',
             'content_java',
           ],
           'variables': {
             'java_in_dir': '../content/public/test/android/javatests',
@@ skipping 22 matching lines @@
             'resource_dir': 'shell/android/shell_apk/res',
             'additional_src_dirs': ['public/android/javatests/',],
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],
   ],
 }