Move test runner to a component

content/content_shell.gypi

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'content_shell_product_name': 'Content Shell',
     # The "19" is so that sites that sniff for version think that this is
     # something reasonably current; the "77.34.5" is a hint that this isn't a
     # standard Chrome.
@@ skipping 33 matching lines @@
         '../base/base.gyp:base',
         '../base/base.gyp:base_static',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../cc/blink/cc_blink.gyp:cc_blink',
         '../cc/cc.gyp:cc',
         '../components/components.gyp:crash_component_breakpad_mac_to_be_deleted',
         '../components/components.gyp:devtools_discovery',
         '../components/components.gyp:devtools_http_handler',
         '../components/components.gyp:web_cache_renderer',
         '../components/components.gyp:plugins_renderer',
+        '../components/test_runner/test_runner.gyp:test_runner',
         '../device/bluetooth/bluetooth.gyp:device_bluetooth',
         '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
         '../gin/gin.gyp:gin',
         '../gpu/gpu.gyp:gpu',
         '../ipc/ipc.gyp:ipc',
         '../media/blink/media_blink.gyp:media_blink',
         '../media/media.gyp:media',
         '../net/net.gyp:net',
         '../net/net.gyp:net_resources',
         '../skia/skia.gyp:skia',
@@ skipping 134 matching lines @@
         'shell/common/layout_test/layout_test_messages.h',
         'shell/common/leak_detection_result.h',
         'shell/common/shell_content_client.cc',
         'shell/common/shell_content_client.h',
         'shell/common/shell_messages.cc',
         'shell/common/shell_messages.h',
         'shell/common/shell_switches.cc',
         'shell/common/shell_switches.h',
         'shell/common/shell_test_configuration.cc',
         'shell/common/shell_test_configuration.h',
-        'shell/common/test_runner/test_preferences.cc',
-        'shell/common/test_runner/test_preferences.h',
         'shell/common/v8_breakpad_support_win.cc',
         'shell/common/v8_breakpad_support_win.h',
         'shell/renderer/ipc_echo.cc',
         'shell/renderer/ipc_echo.h',
         'shell/renderer/layout_test/blink_test_helpers.cc',
         'shell/renderer/layout_test/blink_test_helpers.h',
         'shell/renderer/layout_test/blink_test_runner.cc',
         'shell/renderer/layout_test/blink_test_runner.h',
         'shell/renderer/layout_test/gc_controller.cc',
         'shell/renderer/layout_test/gc_controller.h',
         'shell/renderer/layout_test/layout_test_content_renderer_client.cc',
         'shell/renderer/layout_test/layout_test_content_renderer_client.h',
         'shell/renderer/layout_test/layout_test_render_frame_observer.cc',
         'shell/renderer/layout_test/layout_test_render_frame_observer.h',
         'shell/renderer/layout_test/layout_test_render_process_observer.cc',
         'shell/renderer/layout_test/layout_test_render_process_observer.h',
         'shell/renderer/layout_test/leak_detector.cc',
         'shell/renderer/layout_test/leak_detector.h',
         'shell/renderer/layout_test/test_media_stream_renderer_factory.cc',
         'shell/renderer/layout_test/test_media_stream_renderer_factory.h',
         'shell/renderer/layout_test/test_plugin_placeholder.cc',
         'shell/renderer/layout_test/test_plugin_placeholder.h',
         'shell/renderer/layout_test/test_video_frame_provider.cc',
         'shell/renderer/layout_test/test_video_frame_provider.h',
         'shell/renderer/shell_content_renderer_client.cc',
         'shell/renderer/shell_content_renderer_client.h',
         'shell/renderer/shell_render_view_observer.cc',
         'shell/renderer/shell_render_view_observer.h',
-        'shell/renderer/test_runner/accessibility_controller.cc',
-        'shell/renderer/test_runner/accessibility_controller.h',
-        'shell/renderer/test_runner/app_banner_client.cc',
-        'shell/renderer/test_runner/app_banner_client.h',
-        'shell/renderer/test_runner/event_sender.cc',
-        'shell/renderer/test_runner/event_sender.h',
-        'shell/renderer/test_runner/gamepad_controller.cc',
-        'shell/renderer/test_runner/gamepad_controller.h',
-        'shell/renderer/test_runner/mock_color_chooser.cc',
-        'shell/renderer/test_runner/mock_color_chooser.h',
-        'shell/renderer/test_runner/mock_constraints.cc',
-        'shell/renderer/test_runner/mock_constraints.h',
-        'shell/renderer/test_runner/mock_credential_manager_client.cc',
-        'shell/renderer/test_runner/mock_credential_manager_client.h',
-        'shell/renderer/test_runner/mock_grammar_check.cc',
-        'shell/renderer/test_runner/mock_grammar_check.h',
-        'shell/renderer/test_runner/mock_screen_orientation_client.cc',
-        'shell/renderer/test_runner/mock_screen_orientation_client.h',
-        'shell/renderer/test_runner/mock_spell_check.cc',
-        'shell/renderer/test_runner/mock_spell_check.h',
-        'shell/renderer/test_runner/mock_web_audio_device.cc',
-        'shell/renderer/test_runner/mock_web_audio_device.h',
-        'shell/renderer/test_runner/mock_web_media_stream_center.cc',
-        'shell/renderer/test_runner/mock_web_media_stream_center.h',
-        'shell/renderer/test_runner/mock_web_midi_accessor.cc',
-        'shell/renderer/test_runner/mock_web_midi_accessor.h',
-        'shell/renderer/test_runner/mock_web_speech_recognizer.cc',
-        'shell/renderer/test_runner/mock_web_speech_recognizer.h',
-        'shell/renderer/test_runner/mock_web_theme_engine.cc',
-        'shell/renderer/test_runner/mock_web_theme_engine.h',
-        'shell/renderer/test_runner/mock_web_user_media_client.cc',
-        'shell/renderer/test_runner/mock_web_user_media_client.h',
-        'shell/renderer/test_runner/mock_webrtc_data_channel_handler.cc',
-        'shell/renderer/test_runner/mock_webrtc_data_channel_handler.h',
-        'shell/renderer/test_runner/mock_webrtc_dtmf_sender_handler.cc',
-        'shell/renderer/test_runner/mock_webrtc_dtmf_sender_handler.h',
-        'shell/renderer/test_runner/mock_webrtc_peer_connection_handler.cc',
-        'shell/renderer/test_runner/mock_webrtc_peer_connection_handler.h',
-        'shell/renderer/test_runner/spell_check_client.cc',
-        'shell/renderer/test_runner/spell_check_client.h',
-        'shell/renderer/test_runner/test_common.cc',
-        'shell/renderer/test_runner/test_common.h',
-        'shell/renderer/test_runner/test_interfaces.cc',
-        'shell/renderer/test_runner/test_interfaces.h',
-        'shell/renderer/test_runner/test_plugin.cc',
-        'shell/renderer/test_runner/test_plugin.h',
-        'shell/renderer/test_runner/test_runner.cc',
-        'shell/renderer/test_runner/test_runner.h',
-        'shell/renderer/test_runner/text_input_controller.cc',
-        'shell/renderer/test_runner/text_input_controller.h',
-        'shell/renderer/test_runner/web_ax_object_proxy.cc',
-        'shell/renderer/test_runner/web_ax_object_proxy.h',
-        'shell/renderer/test_runner/web_content_settings.cc',
-        'shell/renderer/test_runner/web_content_settings.h',
-        'shell/renderer/test_runner/web_frame_test_proxy.h',
-        'shell/renderer/test_runner/web_task.cc',
-        'shell/renderer/test_runner/web_task.h',
-        'shell/renderer/test_runner/web_test_delegate.h',
-        'shell/renderer/test_runner/web_test_interfaces.cc',
-        'shell/renderer/test_runner/web_test_interfaces.h',
-        'shell/renderer/test_runner/web_test_proxy.cc',
-        'shell/renderer/test_runner/web_test_proxy.h',
-        'shell/renderer/test_runner/web_test_runner.h',
       ],
       'msvs_settings': {
         'VCLinkerTool': {
           'SubSystem': '2',  # Set /SUBSYSTEM:WINDOWS
         },
       },
       'conditions': [
         ['OS=="win" and win_use_allocator_shim==1', {
           'dependencies': [
             '../base/allocator/allocator.gyp:allocator',
@@ skipping 105 matching lines @@
         }]
       ],
     },
     {
       # GN version: //content/shell:resources
       'target_name': 'content_shell_resources',
       'type': 'none',
       'variables': {
         'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content',
       },
+      'dependencies': [
+        '../components/test_runner/test_runner.gyp:resources',
+      ],
       'actions': [
         {
           'action_name': 'generate_content_shell_resources',
           'variables': {
             'grit_grd_file': 'shell/shell_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
       ],
       'includes': [ '../build/grit_target.gypi' ],
       'copies': [
         {
           'destination': '<(PRODUCT_DIR)',
           'files': [
             '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak'
           ],
         },
       ],
-      'conditions': [
-        ['OS=="win"', {
-          'copies': [{
-            'destination': '<(PRODUCT_DIR)',
-            'files': ['shell/renderer/test_runner/resources/fonts/AHEM____.TTF'],
-          }],
-        }],
-        ['OS=="mac"', {
-          'all_dependent_settings': {
-            'mac_bundle_resources': [
-              'shell/renderer/test_runner/resources/fonts/AHEM____.TTF',
-              'shell/renderer/test_runner/resources/fonts/ChromiumAATTest.ttf',
-              '<(SHARED_INTERMEDIATE_DIR)/webkit/missingImage.png',
-              '<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png',
-            ],
-          },
-        }],
-        ['use_x11 == 1', {
-          'copies': [{
-            'destination': '<(PRODUCT_DIR)',
-            'files': [
-              'shell/renderer/test_runner/resources/fonts/AHEM____.TTF',
-              'shell/renderer/test_runner/resources/fonts/fonts.conf',
-              '../third_party/gardiner_mod/GardinerModBug.ttf',
-              '../third_party/gardiner_mod/GardinerModCat.ttf',
-            ]
-          }],
-        }],
-        ['OS=="android"', {
-          'copies': [{
-            'destination': '<(PRODUCT_DIR)',
-            'files': [
-              'shell/renderer/test_runner/resources/fonts/AHEM____.TTF',
-              'shell/renderer/test_runner/resources/fonts/android_main_fonts.xml',
-              'shell/renderer/test_runner/resources/fonts/android_fallback_fonts.xml',
-            ]
-          }],
-        }],
-      ],
     },
     {
       # We build a minimal set of resources so WebKit in content_shell has
       # access to necessary resources.
       # GN version: //content/shell:pak
       'target_name': 'content_shell_pak',
       'type': 'none',
       'dependencies': [
         'app/resources/content_resources.gyp:content_resources',
         'app/strings/content_strings.gyp:content_strings',
@@ skipping 308 matching lines @@
         ['os_posix == 1 and OS != "mac"', {
           'copies': [{
             'destination': '<(PRODUCT_DIR)/plugins',
             'files': ['<(PRODUCT_DIR)/libtest_netscape_plugin.so'],
           }],
         }],
       ],
     }
   ],
   'conditions': [
-    ['OS=="mac" or OS=="win"', {
-      'targets': [
-        {
-          # GN version: //content/shell:layout_test_helper
-          'target_name': 'layout_test_helper',
-          'type': 'executable',
-          'sources': [
-            'shell/renderer/test_runner/helper/layout_test_helper_mac.mm',
-            'shell/renderer/test_runner/helper/layout_test_helper_win.cc',
-          ],
-          'conditions': [
-            ['OS=="mac"', {
-              'link_settings': {
-                'libraries': [
-                  '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
-                ],
-              },
-            }],
-          ],
-        },
-      ],
-    }],  # OS=="mac" or OS=="win"
     ['OS=="mac"', {
       'targets': [
         {
           'target_name': 'content_shell_framework',
           'type': 'shared_library',
           'product_name': '<(content_shell_product_name) Framework',
           'mac_bundle': 1,
           'mac_bundle_resources': [
             'shell/app/English.lproj/HttpAuth.xib',
             'shell/app/English.lproj/MainMenu.xib',
@@ skipping 338 matching lines @@
                 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
                 '--destination_dir', '<(dest_dir)',
               ],
             },
           ],
         },
       ],
     }],  # OS=="win" and fastbuild==0 and target_arch=="ia32"
   ]
 }