Move source files from webkit/support to content/test

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': [
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
+        '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_test_support',
         '../url/url.gyp:url_lib',
         'content_app_both',
         'content_browser',
         'content_common',
       ],
       'include_dirs': [
         '..',
       ],
@@ skipping 81 matching lines @@
         'gpu/gpu_idirect3d9_mock_win.h',
         'test/content_test_suite.cc',
         'test/content_test_suite.h',
         'test/layouttest_support.cc',
         'test/mock_keyboard.cc',
         'test/mock_keyboard.h',
         'test/mock_keyboard_driver_win.cc',
         'test/mock_keyboard_driver_win.h',
         'test/mock_render_process.cc',
         'test/mock_render_process.h',
+        'test/mock_webclipboard_impl.cc',
+        'test/mock_webclipboard_impl.h',
+        'test/net/url_request_abort_on_end_job.cc',
+        'test/net/url_request_abort_on_end_job.h',
         'test/net/url_request_failed_job.cc',
         'test/net/url_request_failed_job.h',
         'test/net/url_request_mock_http_job.cc',
         'test/net/url_request_mock_http_job.h',
         'test/net/url_request_prepackaged_interceptor.cc',
         'test/net/url_request_prepackaged_interceptor.h',
         'test/net/url_request_slow_download_job.cc',
         'test/net/url_request_slow_download_job.h',
-        'test/net/url_request_abort_on_end_job.cc',
-        'test/net/url_request_abort_on_end_job.h',
         'test/ppapi_unittest.cc',
         'test/ppapi_unittest.h',
         'test/test_content_browser_client.cc',
         'test/test_content_browser_client.h',
         'test/test_content_client.cc',
         'test/test_content_client.h',
         'test/test_media_stream_client.cc',
         'test/test_media_stream_client.h',
         'test/test_render_view_host_factory.cc',
         'test/test_render_view_host_factory.h',
         'test/test_video_frame_provider.cc',
         'test/test_video_frame_provider.h',
         'test/test_web_contents.cc',
         'test/test_web_contents.h',
         'test/test_web_contents_view.cc',
         'test/test_web_contents_view.h',
+        'test/test_webkit_platform_support.cc',
+        'test/test_webkit_platform_support.h',
+        'test/web_gesture_curve_mock.cc',
+        'test/web_gesture_curve_mock.h',
+        'test/web_layer_tree_view_impl_for_testing.cc',
+        'test/web_layer_tree_view_impl_for_testing.h',
+        'test/webkit_support.cc',
+        'test/webkit_support.h',
+        'test/webkit_support_glue.cc',
+        'test/weburl_loader_mock.cc',
+        'test/weburl_loader_mock.h',
+        'test/weburl_loader_mock_factory.cc',
+        'test/weburl_loader_mock_factory.h',
 
         # TODO(phajdan.jr): Those files should be moved to webkit
         # test support target.
         '../webkit/browser/appcache/appcache_test_helper.cc',
         '../webkit/browser/appcache/appcache_test_helper.h',
       ],
+      'variables': {
+        'test_shell_images_mac': [
+          '../webkit/tools/test_shell/resources/missingImage.png',
+          '../webkit/tools/test_shell/resources/textAreaResizeCorner.png',
+        ],
+        'test_shell_images': [
+          '../webkit/tools/test_shell/resources/missingImage.gif',

[stuartmorgan, 2013/09/13 00:15:55]

Sorry, I missed the png/gif difference on this file; I thought these two arrays
were identical, which is why I suggested a variable to remove the duplication.
Since they aren't this doesn't help, so the old structure was better.

[tfarina, 2013/09/13 03:18:01]

Done.

+          '../webkit/tools/test_shell/resources/textAreaResizeCorner.png',
+        ],
+      },
       'conditions': [
+        ['OS=="mac"', {
+          'copies': [{
+            'destination': '<(SHARED_INTERMEDIATE_DIR)/webkit',
+            'files': [
+              '<@(test_shell_images_mac)',
+            ],
+          }],
+        }],
         ['OS == "ios"', {
           'sources/': [
             # iOS only needs a small portion of content; exclude all the
             # implementation, and re-include what is used.
             ['exclude', '\\.(cc|mm)$'],
             ['include', '_ios\\.(cc|mm)$'],
             ['include', '^public/test/content_test_suite_base\\.cc$'],
             ['include', '^public/test/mock_notification_observer\\.cc$'],
             ['include', '^public/test/mock_resource_context\\.cc$'],
             ['include', '^public/test/test_browser_thread\\.cc$'],
             ['include', '^public/test/test_content_client_initializer\\.cc$'],
             ['include', '^public/test/test_notification_tracker\\.cc$'],
             ['include', '^public/test/test_utils\\.cc$'],
             ['include', '^public/test/unittest_test_suite\\.cc$'],
             ['include', '^test/content_test_suite\\.cc$'],
             ['include', '^test/test_content_browser_client\\.cc$'],
             ['include', '^test/test_content_client\\.cc$'],
           ],
         }, {  # OS != "ios"
+          'copies': [{
+            'destination': '<(PRODUCT_DIR)/DumpRenderTree_resources',

[stuartmorgan, 2013/09/13 00:15:55]

!ios includes Mac; now you're doing this twice on Mac. I think you probably want
to just move the whole if/else conditions block into the !ios section, so it
stays as an if/else for clarity.

[tfarina, 2013/09/13 03:18:01]

Done.

+            'files': [
+              '<@(test_shell_images)',
+            ],
+          }],
           'dependencies': [
             'content_child',
             'content_gpu',
             'content_ppapi_plugin',
             'content_renderer',
             'content_utility',
             'content_worker',
             '../media/media.gyp:media',
             '../ppapi/ppapi_internal.gyp:ppapi_host',
             '../ppapi/ppapi_internal.gyp:ppapi_proxy',
             '../ppapi/ppapi_internal.gyp:ppapi_shared',
             '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
             '../third_party/WebKit/public/blink.gyp:blink',
             '../third_party/WebKit/public/blink_test_runner.gyp:blink_test_runner',
             '../ui/surface/surface.gyp:surface',
             '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
+            '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
             '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
-            '../webkit/support/webkit_support.gyp:webkit_support_common',
+            '../webkit/renderer/webkit_renderer.gyp:webkit_renderer',
             '../webkit/storage_browser.gyp:webkit_storage_browser',
             '../webkit/storage_common.gyp:webkit_storage_common',
+            '../webkit/support/webkit_support.gyp:glue',
+            '../webkit/support/webkit_support.gyp:glue_child',
           ],
         }],
         ['OS == "win" or toolkit_uses_gtk == 1', {
           'dependencies': [
             '../sandbox/sandbox.gyp:sandbox',
           ],
         }],
         ['enable_webrtc==1', {
           'sources': [
             'renderer/media/mock_media_stream_dependency_factory.cc',
@@ skipping 853 matching lines @@
             '..',
           ],
           'sources': [
             'common/gpu/client/gl_helper_benchmark.cc',
           ],
         },
         {
           'target_name': 'content_webkit_unit_test_support',
           'type': 'static_library',
           'dependencies': [
-            '../webkit/support/webkit_support.gyp:webkit_support',
+            'test_support_content',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
             'test/webkit_unit_test_support.cc',
             'test/webkit_unit_test_support.h',
           ],
         },
       ],
@@ skipping 349 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }