Split content_shell dependencies for layout tests.

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': 'layout_tests_support_content',

[jam, 2014/04/02 17:43:20]

call this target layouttest_support_content to match the header and cc file
below. also same for the android target, that should be
layouttest_support_content_jni_headers

[Primiano Tucci (use gerrit), 2014/04/02 18:22:35]

Done.

+      'type': 'static_library',
+      'conditions': [
+        ['OS=="android"', {
+          'dependencies': [
+            'layout_tests_support_content_jni_headers',
+          ],
+        }],
+      ],
+      'dependencies': [
+        '../skia/skia.gyp:skia',
+        '../v8/tools/gyp/v8.gyp:v8',
+        '../webkit/common/webkit_common.gyp:webkit_common',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'public/test/layouttest_support.h',
+        'public/test/nested_message_pump_android.cc',
+        'public/test/nested_message_pump_android.h',
+        'shell/browser/shell_layout_tests_android.cc',

[jam, 2014/04/02 17:43:20]

these two files in shell/ should be in content_shell's gypi file as before

[Primiano Tucci (use gerrit), 2014/04/02 18:22:35]

Done.

+        'shell/browser/shell_layout_tests_android.h',
+        'test/layouttest_support.cc',
+        'test/mock_webclipboard_impl.cc',
+        'test/mock_webclipboard_impl.h',
+        'test/test_media_stream_client.cc',
+        'test/test_media_stream_client.h',
+      ],
+    },
+    {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'dependencies': [
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../ui/accessibility/accessibility.gyp:ax_gen',
         '../ui/base/ui_base.gyp:ui_base',
         '../ui/events/events.gyp:dom4_keycode_converter',
@@ skipping 33 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_test.cc',
         'public/test/render_view_test.h',
         'public/test/render_widget_test.cc',
         'public/test/render_widget_test.h',
         'public/test/sandbox_file_system_test_helper.cc',
         'public/test/sandbox_file_system_test_helper.h',
         'public/test/test_browser_context.cc',
         'public/test/test_browser_context.h',
         'public/test/test_browser_thread.cc',
         'public/test/test_browser_thread.h',
@@ skipping 217 matching lines @@
           ],
         }],
         ['OS!="android" and OS!="ios"', {
           'dependencies': [
             '../third_party/libvpx/libvpx.gyp:libvpx',
           ],
         }],
         ['OS=="android"', {
           'dependencies': [
             '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
-            'test_support_content_jni_headers',
           ],
         }],
       ],
     },
     {
       'target_name': 'content_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         'content.gyp:content_browser',
         'content.gyp:content_common',
@@ skipping 1264 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',
+          'target_name': 'layout_tests_support_content_jni_headers',
           'type': 'none',
           'sources': [
             'public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java',
+            'shell/android/java/src/org/chromium/content_shell/ShellLayoutTestUtils.java',

[jam, 2014/04/02 17:43:20]

ditto: this should stay in content_shell's gypi

           ],
           'variables': {
             'jni_gen_package': 'content/public/test',
             'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'content_java_test_support',
           'type': 'none',
@@ skipping 173 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }