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'],
       'dependencies': [
         '../media/media.gyp:media',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../ui/ui.gyp:ui_test_support',
         '../url/url.gyp:url_lib',
         'content_app',
         'content_browser',
         'content_common',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'public/test/browser_test_base.cc',
         'public/test/browser_test_base.h',
         'public/test/browser_test.h',
+        'public/test/browser_test_message_pump_android.cc',
+        'public/test/browser_test_message_pump_android.h',
         'public/test/browser_test_utils.cc',
         'public/test/browser_test_utils.h',
         'public/test/content_test_suite_base.cc',
         'public/test/content_test_suite_base.h',
         'public/test/download_test_observer.cc',
         'public/test/download_test_observer.h',
         'public/test/fake_speech_recognition_manager.cc',
         'public/test/fake_speech_recognition_manager.h',
         'public/test/js_injection_ready_observer.h',
         'public/test/layouttest_support.h',
@@ skipping 184 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 592 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 296 matching lines @@
             '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/BrowserTestSystemMessageHandler.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' ],
         },
       ],
     }],
   ],
 }