Split content_shell dependencies for layout tests.

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index e1fe5465a8584770b067b716b050bc16fd7d408c..d860f64a398028d0fa71165cf73aab8f64a69bca 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -5,6 +5,37 @@
 {
   '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': [
@@ -58,8 +89,6 @@
         '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',
@@ -297,7 +326,6 @@
         ['OS=="android"', {
           'dependencies': [
             '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
-            'test_support_content_jni_headers',
           ],
         }],
       ],
@@ -1582,10 +1610,11 @@
     ['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',