Remove test_shell from build target on chromeos.

test_shell doesn't compile for Chrome OS now, nevertheless
it was included in "make/ninja All" build and made
linux_chromeos_clang bot fail.
This patch disables the target on Chrome OS.

BUG=165375
TEST="git cl try -b linux_chromeos_clang:compile" passes.

Review URL: https://chromiumcodereview.appspot.com/11642011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173888 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 428 insertions, 423 deletions

diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index 336a097..cc5fd3a 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -29,308 +29,6 @@
       ],
     },
     {
-      'target_name': 'test_shell_common',
-      'type': 'static_library',
-      'variables': {
-        'chromium_code': 1,
-      },
-      'dependencies': [
-        '../build/temp_gyp/googleurl.gyp:googleurl',
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/base/base.gyp:base_i18n',
-        '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
-        '<(DEPTH)/media/media.gyp:media',
-        '<(DEPTH)/net/net.gyp:net',
-        '<(DEPTH)/skia/skia.gyp:skia',
-        '<(DEPTH)/testing/gmock.gyp:gmock',
-        '<(DEPTH)/testing/gtest.gyp:gtest',
-        '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:inspector_resources',
-        '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
-        '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme',
-        '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:user_agent',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_gpu',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_media',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_storage',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support_common',
-      ],
-      'sources': [
-        'mac/test_shell_webview.h',
-        'mac/test_shell_webview.mm',
-        'accessibility_ui_element.cc',
-        'accessibility_ui_element.h',
-        'drop_delegate.cc',
-        'drop_delegate.h',
-        'mock_spellcheck.cc',
-        'mock_spellcheck.h',
-        'notification_presenter.cc',
-        'notification_presenter.h',
-        'resource.h',
-        'test_navigation_controller.cc',
-        'test_navigation_controller.h',
-        'test_shell.cc',
-        'test_shell.h',
-        'test_shell_devtools_agent.cc',
-        'test_shell_devtools_agent.h',
-        'test_shell_devtools_callargs.cc',
-        'test_shell_devtools_callargs.h',
-        'test_shell_devtools_client.cc',
-        'test_shell_devtools_client.h',
-        'test_shell_gtk.cc',
-        'test_shell_x11.cc',
-        'test_shell_mac.mm',
-        'test_shell_platform_delegate.h',
-        'test_shell_platform_delegate_gtk.cc',
-        'test_shell_platform_delegate_mac.mm',
-        'test_shell_platform_delegate_win.cc',
-        'test_shell_switches.cc',
-        'test_shell_switches.h',
-        'test_shell_win.cc',
-        'test_shell_webkit_init.cc',
-        'test_shell_webkit_init.h',
-        'test_shell_webthemecontrol.h',
-        'test_shell_webthemecontrol.cc',
-        'test_shell_webthemeengine.h',
-        'test_shell_webthemeengine.cc',
-        'test_webview_delegate.cc',
-        'test_webview_delegate.h',
-        'test_webview_delegate_mac.mm',
-        'test_webview_delegate_gtk.cc',
-        'test_webview_delegate_win.cc',
-        'webview_host.h',
-        'webview_host_gtk.cc',
-        'webview_host_mac.mm',
-        'webview_host_win.cc',
-        'webwidget_host.h',
-        'webwidget_host.cc',
-        'webwidget_host_gtk.cc',
-        'webwidget_host_mac.mm',
-        'webwidget_host_win.cc',
-      ],
-      'export_dependent_settings': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/net/net.gyp:net',
-        '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:user_agent',
-      ],
-      'conditions': [
-        ['target_arch!="arm"', {
-          'dependencies': [
-            'copy_npapi_test_plugin',
-          ],
-        }],
-        ['toolkit_uses_gtk == 1', {
-          'dependencies': [
-            'test_shell_resources',
-            '<(DEPTH)/build/linux/system.gyp:gtk',
-            '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-          ],
-          # for:  test_shell_gtk.cc
-          'cflags': ['-Wno-multichar'],
-        }],
-        ['OS=="win"', {
-          'msvs_disabled_warnings': [ 4800 ],
-          'link_settings': {
-            'libraries': [
-              '-lcomctl32.lib',
-            ],
-          },
-          'include_dirs': [
-            '<(DEPTH)/third_party/wtl/include',
-            '.',
-          ],
-          'dependencies': [
-            '<(DEPTH)/breakpad/breakpad.gyp:breakpad_handler',
-          ],
-        }, {  # else: OS!=win
-          'sources/': [
-            ['exclude', '_webtheme(control|engine)\.(cc|h)$'],
-          ],
-          'sources!': [
-            'drop_delegate.cc',
-          ],
-        }],
-      ],
-    },
-    {
-      'target_name': 'test_shell_pak',
-      'type': 'none',
-      'variables': {
-        'repack_path': '../../../tools/grit/grit/format/repack.py',
-        'pak_path': '<(INTERMEDIATE_DIR)/repack/test_shell.pak',
-      },
-      'conditions': [
-        ['os_posix == 1 and OS != "mac"', {
-          'actions': [
-            {
-              'action_name': 'test_shell_repack',
-              'variables': {
-                'pak_inputs': [
-                  '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
-                  '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak',
-                  '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
-                  '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
-                  '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
-                  '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
-                ],
-              },
-              'inputs': [
-                '<(repack_path)',
-                '<@(pak_inputs)',
-              ],
-              'outputs': [
-                '<(pak_path)',
-              ],
-              'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
-            },
-          ],
-          'copies': [
-            {
-              'destination': '<(PRODUCT_DIR)',
-              'files': ['<(pak_path)'],
-            },
-          ],
-        }],
-      ],
-    },
-    {
-      'target_name': 'test_shell',
-      'type': 'executable',
-      'variables': {
-        'chromium_code': 1,
-      },
-      'mac_bundle': 1,
-      'dependencies': [
-        'test_shell_common',
-        '<(DEPTH)/net/net.gyp:net_test_support',
-        '<(DEPTH)/skia/skia.gyp:skia',
-        '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
-        'pull_in_copy_TestNetscapePlugIn',
-        '<(DEPTH)/tools/imagediff/image_diff.gyp:image_diff',
-        '<(DEPTH)/ui/gl/gl.gyp:gl',
-      ],
-      'defines': [
-        # Technically not a unit test but require functions available only to
-        # unit tests.
-        'UNIT_TEST'
-      ],
-      'sources': [
-        'test_shell_main.cc',
-      ],
-      'mac_bundle_resources': [
-        '../../data/test_shell/',
-        'mac/English.lproj/InfoPlist.strings',
-        'mac/English.lproj/MainMenu.xib',
-        'mac/Info.plist',
-        'mac/test_shell.icns',
-        'resources/AHEM____.TTF',
-      ],
-      'mac_bundle_resources!': [
-        # TODO(mark): Come up with a fancier way to do this (mac_info_plist?)
-        # that automatically sets the correct INFOPLIST_FILE setting and adds
-        # the file to a source group.
-        'mac/Info.plist',
-      ],
-      'xcode_settings': {
-        'INFOPLIST_FILE': '<(DEPTH)/webkit/tools/test_shell/mac/Info.plist',
-      },
-      'conditions': [
-        ['OS=="win"', {
-          'resource_include_dirs': [
-            '<(SHARED_INTERMEDIATE_DIR)/webkit',
-          ],
-          'sources': [
-            '<@(test_shell_windows_resource_files)',
-            # TODO:  It would be nice to have these pulled in
-            # automatically from direct_dependent_settings in
-            # their various targets (net.gyp:net_resources, etc.),
-            # but that causes errors in other targets when
-            # resulting .res files get referenced multiple times.
-            '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_unscaled_resources.rc',
-          ],
-          'configurations': {
-            'Debug_Base': {
-              'msvs_settings': {
-                'VCLinkerTool': {
-                  'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
-                },
-              },
-            },
-          },
-        }],
-        ['toolkit_uses_gtk == 1', {
-          'conditions': [
-            ['linux_use_tcmalloc==1', {
-              'dependencies': [
-                '<(DEPTH)/base/allocator/allocator.gyp:allocator',
-              ],
-            }],
-          ],
-          'dependencies': [
-            '<(DEPTH)/build/linux/system.gyp:gtk',
-            'test_shell_resources',
-            'test_shell_pak',
-          ],
-        }],
-        ['OS=="mac"', {
-          'product_name': 'TestShell',
-          'dependencies': [
-            '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
-          ],
-          'variables': {
-            'repack_path': '../../../tools/grit/grit/format/repack.py',
-          },
-          'actions': [
-            {
-              # TODO(mark): Make this work with more languages than the
-              # hardcoded en-US.
-              'action_name': 'repack_locale',
-              'variables': {
-                'pak_inputs': [
-                  '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
-                  '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
-                  '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
-                ],
-              },
-              'inputs': [
-                '<(repack_path)',
-                '<@(pak_inputs)',
-              ],
-              'outputs': [
-                '<(INTERMEDIATE_DIR)/repack/test_shell.pak',
-              ],
-              'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
-              'process_outputs_as_mac_bundle_resources': 1,
-            },
-          ],
-          'copies': [
-            {
-              # Copy FFmpeg binaries for audio/video support.
-              'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/MacOS/',
-              'files': [
-                '<(PRODUCT_DIR)/ffmpegsumo.so',
-              ],
-            },
-          ],
-        }, { # OS != "mac"
-          'dependencies': [
-            '<(DEPTH)/net/net.gyp:net_resources',
-            '<(DEPTH)/ui/ui.gyp:ui_resources',
-            '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
-            '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
-          ]
-        }],
-      ],
-    },
-    {
       # TODO(tony): This should be moved to webkit_glue.gypi or
       # webkit_tests.gypi and named something like test_mock_plugin_list.
       'target_name': 'test_shell_test_support',
@@ -343,129 +41,436 @@
         '../../plugins/npapi/mock_plugin_list.h',
       ]
     },
-    {
-      'target_name': 'test_shell_tests',
-      'type': 'executable',
-      'variables': {
-        'chromium_code': 1,
-      },
-      'dependencies': [
-        '../build/temp_gyp/googleurl.gyp:googleurl',
-        'test_shell_common',
-        '<(DEPTH)/base/base.gyp:test_support_base',
-        '<(DEPTH)/net/net.gyp:net',
-        '<(DEPTH)/net/net.gyp:net_test_support',
-        '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared',
-        '<(DEPTH)/skia/skia.gyp:skia',
-        '<(DEPTH)/testing/gmock.gyp:gmock',
-        '<(DEPTH)/testing/gtest.gyp:gtest',
-        '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:user_agent',
-      ],
-      'sources': [
-        '../../glue/cpp_bound_class_unittest.cc',
-        '../../glue/cpp_variant_unittest.cc',
-        '../../glue/dom_operations_unittest.cc',
-        '../../glue/dom_serializer_unittest.cc',
-        '../../glue/glue_serialize_unittest.cc',
-        '../../glue/multipart_response_delegate_unittest.cc',
-        '../../glue/regular_expression_unittest.cc',
-        '../../glue/resource_fetcher_unittest.cc',
-        '../../glue/resource_request_body_unittest.cc',
-        '../../glue/touch_fling_platform_gesture_curve_unittest.cc',
-        '../../glue/unittest_test_server.h',
-        '../../glue/webcursor_unittest.cc',
-        '../../glue/webkit_glue_unittest.cc',
-        '../../glue/worker_task_runner_unittest.cc',
-        '../../mocks/mock_resource_loader_bridge.h',
-        '../../mocks/mock_webframeclient.h',
-        '../../mocks/mock_weburlloader.cc',
-        '../../mocks/mock_weburlloader.h',
-        '../../plugins/ppapi/host_var_tracker_unittest.cc',
-        '../../plugins/ppapi/mock_platform_image_2d.cc',
-        '../../plugins/ppapi/mock_platform_image_2d.h',
-        '../../plugins/ppapi/mock_plugin_delegate.cc',
-        '../../plugins/ppapi/mock_plugin_delegate.h',
-        '../../plugins/ppapi/mock_resource.h',
-        '../../plugins/ppapi/ppb_graphics_2d_impl_unittest.cc',
-        '../../plugins/ppapi/ppapi_unittest.cc',
-        '../../plugins/ppapi/ppapi_unittest.h',
-        '../../plugins/ppapi/quota_file_io_unittest.cc',
-        '../../user_agent/user_agent_unittest.cc',
-        '../webcore_unit_tests/BMPImageDecoder_unittest.cpp',
-        '../webcore_unit_tests/ICOImageDecoder_unittest.cpp',
-        'image_decoder_unittest.cc',
-        'image_decoder_unittest.h',
-        'mock_spellcheck_unittest.cc',
-        'plugin_tests.cc',
-        'run_all_tests.cc',
-        'test_shell_test.cc',
-        'test_shell_test.h',
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'resource_include_dirs': [
-            '<(SHARED_INTERMEDIATE_DIR)/webkit',
-          ],
-          'sources': [ '<@(test_shell_windows_resource_files)' ],
-          'configurations': {
-            'Debug_Base': {
-              'msvs_settings': {
-                'VCLinkerTool': {
-                  'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
-                },
-              },
-            },
-          },
-        }],
-        ['toolkit_uses_gtk == 1', {
-          'dependencies': [
-            'test_shell_pak',
-            '<(DEPTH)/build/linux/system.gyp:gtk',
-          ],
-        }],
-        ['chromeos==1', {
-          'sources': [
-            '../../chromeos/fileapi/file_access_permissions_unittest.cc',
-            '../../chromeos/fileapi/memory_file_util.cc',
-            '../../chromeos/fileapi/memory_file_util.h',
-            '../../chromeos/fileapi/memory_file_util_unittest.cc',
-          ],
-        }],
-        ['OS=="mac"', {
-          # mac tests load the resources from the built test_shell beside the
-          # test
-          'dependencies': [
-            'test_shell',
-           ],
-          'sources!': [
-            # Disable the image decoder tests because we use CoreGraphics
-            # code on mac and these tests are for the Skia image-decoders.
-            '../webcore_unit_tests/BMPImageDecoder_unittest.cpp',
-            '../webcore_unit_tests/ICOImageDecoder_unittest.cpp',
-            '../webcore_unit_tests/XBMImageDecoder_unittest.cpp',
-            'image_decoder_unittest.cc',
-            'image_decoder_unittest.h',
-          ],
-          'sources': [
-          ],
-        }],
-        ['OS=="win"', {
-          'msvs_disabled_warnings': [ 4800 ],
-        }],
-        ['os_posix == 1 and OS != "mac"', {
-          'conditions': [
-            ['linux_use_tcmalloc==1', {
-              'dependencies': [
-                '<(DEPTH)/base/allocator/allocator.gyp:allocator',
-              ],
-            }],
-          ],
-        }],
-      ],
-    },
   ],
   'conditions': [
+    # Currently test_shell compiles only on Windows, Mac, and Gtk.
+    ['OS=="win" or OS=="mac" or toolkit_uses_gtk==1', {
+      'targets': [
+	{
+	  'target_name': 'test_shell_common',
+	  'type': 'static_library',
+	  'variables': {
+	    'chromium_code': 1,
+	  },
+	  'dependencies': [
+	    '../build/temp_gyp/googleurl.gyp:googleurl',
+	    '<(DEPTH)/base/base.gyp:base',
+	    '<(DEPTH)/base/base.gyp:base_i18n',
+	    '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+	    '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
+	    '<(DEPTH)/media/media.gyp:media',
+	    '<(DEPTH)/net/net.gyp:net',
+	    '<(DEPTH)/skia/skia.gyp:skia',
+	    '<(DEPTH)/testing/gmock.gyp:gmock',
+	    '<(DEPTH)/testing/gtest.gyp:gtest',
+	    '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:inspector_resources',
+	    '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+	    '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme',
+	    '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
+	    '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
+	    '<(DEPTH)/webkit/support/webkit_support.gyp:user_agent',
+	    '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base',
+	    '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_gpu',
+	    '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_media',
+	    '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
+	    '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_storage',
+	    '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support_common',
+	  ],
+	  'sources': [
+	    'mac/test_shell_webview.h',
+	    'mac/test_shell_webview.mm',
+	    'accessibility_ui_element.cc',
+	    'accessibility_ui_element.h',
+	    'drop_delegate.cc',
+	    'drop_delegate.h',
+	    'mock_spellcheck.cc',
+	    'mock_spellcheck.h',
+	    'notification_presenter.cc',
+	    'notification_presenter.h',
+	    'resource.h',
+	    'test_navigation_controller.cc',
+	    'test_navigation_controller.h',
+	    'test_shell.cc',
+	    'test_shell.h',
+	    'test_shell_devtools_agent.cc',
+	    'test_shell_devtools_agent.h',
+	    'test_shell_devtools_callargs.cc',
+	    'test_shell_devtools_callargs.h',
+	    'test_shell_devtools_client.cc',
+	    'test_shell_devtools_client.h',
+	    'test_shell_gtk.cc',
+	    'test_shell_x11.cc',
+	    'test_shell_mac.mm',
+	    'test_shell_platform_delegate.h',
+	    'test_shell_platform_delegate_gtk.cc',
+	    'test_shell_platform_delegate_mac.mm',
+	    'test_shell_platform_delegate_win.cc',
+	    'test_shell_switches.cc',
+	    'test_shell_switches.h',
+	    'test_shell_win.cc',
+	    'test_shell_webkit_init.cc',
+	    'test_shell_webkit_init.h',
+	    'test_shell_webthemecontrol.h',
+	    'test_shell_webthemecontrol.cc',
+	    'test_shell_webthemeengine.h',
+	    'test_shell_webthemeengine.cc',
+	    'test_webview_delegate.cc',
+	    'test_webview_delegate.h',
+	    'test_webview_delegate_mac.mm',
+	    'test_webview_delegate_gtk.cc',
+	    'test_webview_delegate_win.cc',
+	    'webview_host.h',
+	    'webview_host_gtk.cc',
+	    'webview_host_mac.mm',
+	    'webview_host_win.cc',
+	    'webwidget_host.h',
+	    'webwidget_host.cc',
+	    'webwidget_host_gtk.cc',
+	    'webwidget_host_mac.mm',
+	    'webwidget_host_win.cc',
+	  ],
+	  'export_dependent_settings': [
+	    '<(DEPTH)/base/base.gyp:base',
+	    '<(DEPTH)/net/net.gyp:net',
+	    '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+	    '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
+	    '<(DEPTH)/webkit/support/webkit_support.gyp:user_agent',
+	  ],
+	  'conditions': [
+	    ['target_arch!="arm"', {
+	      'dependencies': [
+		'copy_npapi_test_plugin',
+	      ],
+	    }],
+	    ['toolkit_uses_gtk == 1', {
+	      'dependencies': [
+		'test_shell_resources',
+		'<(DEPTH)/build/linux/system.gyp:gtk',
+		'<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
+	      ],
+	      # for:  test_shell_gtk.cc
+	      'cflags': ['-Wno-multichar'],
+	    }],
+	    ['OS=="win"', {
+	      'msvs_disabled_warnings': [ 4800 ],
+	      'link_settings': {
+		'libraries': [
+		  '-lcomctl32.lib',
+		],
+	      },
+	      'include_dirs': [
+		'<(DEPTH)/third_party/wtl/include',
+		'.',
+	      ],
+	      'dependencies': [
+		'<(DEPTH)/breakpad/breakpad.gyp:breakpad_handler',
+	      ],
+	    }, {  # else: OS!=win
+	      'sources/': [
+		['exclude', '_webtheme(control|engine)\.(cc|h)$'],
+	      ],
+	      'sources!': [
+		'drop_delegate.cc',
+	      ],
+	    }],
+	  ],
+	},
+	{
+	  'target_name': 'test_shell_pak',
+	  'type': 'none',
+	  'variables': {
+	    'repack_path': '../../../tools/grit/grit/format/repack.py',
+	    'pak_path': '<(INTERMEDIATE_DIR)/repack/test_shell.pak',
+	  },
+	  'conditions': [
+	    ['os_posix == 1 and OS != "mac"', {
+	      'actions': [
+		{
+		  'action_name': 'test_shell_repack',
+		  'variables': {
+		    'pak_inputs': [
+		      '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
+		      '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak',
+		      '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
+		      '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
+		      '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
+		      '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
+		    ],
+		  },
+		  'inputs': [
+		    '<(repack_path)',
+		    '<@(pak_inputs)',
+		  ],
+		  'outputs': [
+		    '<(pak_path)',
+		  ],
+		  'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
+		},
+	      ],
+	      'copies': [
+		{
+		  'destination': '<(PRODUCT_DIR)',
+		  'files': ['<(pak_path)'],
+		},
+	      ],
+	    }],
+	  ],
+	},
+	{
+	  'target_name': 'test_shell',
+	  'type': 'executable',
+	  'variables': {
+	    'chromium_code': 1,
+	  },
+	  'mac_bundle': 1,
+	  'dependencies': [
+	    'test_shell_common',
+	    '<(DEPTH)/net/net.gyp:net_test_support',
+	    '<(DEPTH)/skia/skia.gyp:skia',
+	    '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
+	    'pull_in_copy_TestNetscapePlugIn',
+	    '<(DEPTH)/tools/imagediff/image_diff.gyp:image_diff',
+	    '<(DEPTH)/ui/gl/gl.gyp:gl',
+	  ],
+	  'defines': [
+	    # Technically not a unit test but require functions available only to
+	    # unit tests.
+	    'UNIT_TEST'
+	  ],
+	  'sources': [
+	    'test_shell_main.cc',
+	  ],
+	  'mac_bundle_resources': [
+	    '../../data/test_shell/',
+	    'mac/English.lproj/InfoPlist.strings',
+	    'mac/English.lproj/MainMenu.xib',
+	    'mac/Info.plist',
+	    'mac/test_shell.icns',
+	    'resources/AHEM____.TTF',
+	  ],
+	  'mac_bundle_resources!': [
+	    # TODO(mark): Come up with a fancier way to do this (mac_info_plist?)
+	    # that automatically sets the correct INFOPLIST_FILE setting and adds
+	    # the file to a source group.
+	    'mac/Info.plist',
+	  ],
+	  'xcode_settings': {
+	    'INFOPLIST_FILE': '<(DEPTH)/webkit/tools/test_shell/mac/Info.plist',
+	  },
+	  'conditions': [
+	    ['OS=="win"', {
+	      'resource_include_dirs': [
+		'<(SHARED_INTERMEDIATE_DIR)/webkit',
+	      ],
+	      'sources': [
+		'<@(test_shell_windows_resource_files)',
+		# TODO:  It would be nice to have these pulled in
+		# automatically from direct_dependent_settings in
+		# their various targets (net.gyp:net_resources, etc.),
+		# but that causes errors in other targets when
+		# resulting .res files get referenced multiple times.
+		'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+		'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
+		'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
+		'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_unscaled_resources.rc',
+	      ],
+	      'configurations': {
+		'Debug_Base': {
+		  'msvs_settings': {
+		    'VCLinkerTool': {
+		      'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+		    },
+		  },
+		},
+	      },
+	    }],
+	    ['toolkit_uses_gtk == 1', {
+	      'conditions': [
+		['linux_use_tcmalloc==1', {
+		  'dependencies': [
+		    '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+		  ],
+		}],
+	      ],
+	      'dependencies': [
+		'<(DEPTH)/build/linux/system.gyp:gtk',
+		'test_shell_resources',
+		'test_shell_pak',
+	      ],
+	    }],
+	    ['OS=="mac"', {
+	      'product_name': 'TestShell',
+	      'dependencies': [
+		'<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
+	      ],
+	      'variables': {
+		'repack_path': '../../../tools/grit/grit/format/repack.py',
+	      },
+	      'actions': [
+		{
+		  # TODO(mark): Make this work with more languages than the
+		  # hardcoded en-US.
+		  'action_name': 'repack_locale',
+		  'variables': {
+		    'pak_inputs': [
+		      '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
+		      '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
+		      '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
+		    ],
+		  },
+		  'inputs': [
+		    '<(repack_path)',
+		    '<@(pak_inputs)',
+		  ],
+		  'outputs': [
+		    '<(INTERMEDIATE_DIR)/repack/test_shell.pak',
+		  ],
+		  'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
+		  'process_outputs_as_mac_bundle_resources': 1,
+		},
+	      ],
+	      'copies': [
+		{
+		  # Copy FFmpeg binaries for audio/video support.
+		  'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/MacOS/',
+		  'files': [
+		    '<(PRODUCT_DIR)/ffmpegsumo.so',
+		  ],
+		},
+	      ],
+	    }, { # OS != "mac"
+	      'dependencies': [
+		'<(DEPTH)/net/net.gyp:net_resources',
+		'<(DEPTH)/ui/ui.gyp:ui_resources',
+		'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
+		'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
+	      ]
+	    }],
+	  ],
+	},
+	{
+	  'target_name': 'test_shell_tests',
+	  'type': 'executable',
+	  'variables': {
+	    'chromium_code': 1,
+	  },
+	  'dependencies': [
+	    '../build/temp_gyp/googleurl.gyp:googleurl',
+	    'test_shell_common',
+	    '<(DEPTH)/base/base.gyp:test_support_base',
+	    '<(DEPTH)/net/net.gyp:net',
+	    '<(DEPTH)/net/net.gyp:net_test_support',
+	    '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared',
+	    '<(DEPTH)/skia/skia.gyp:skia',
+	    '<(DEPTH)/testing/gmock.gyp:gmock',
+	    '<(DEPTH)/testing/gtest.gyp:gtest',
+	    '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
+	    '<(DEPTH)/webkit/support/webkit_support.gyp:user_agent',
+	  ],
+	  'sources': [
+	    '../../glue/cpp_bound_class_unittest.cc',
+	    '../../glue/cpp_variant_unittest.cc',
+	    '../../glue/dom_operations_unittest.cc',
+	    '../../glue/dom_serializer_unittest.cc',
+	    '../../glue/glue_serialize_unittest.cc',
+	    '../../glue/multipart_response_delegate_unittest.cc',
+	    '../../glue/regular_expression_unittest.cc',
+	    '../../glue/resource_fetcher_unittest.cc',
+	    '../../glue/resource_request_body_unittest.cc',
+	    '../../glue/touch_fling_platform_gesture_curve_unittest.cc',
+	    '../../glue/unittest_test_server.h',
+	    '../../glue/webcursor_unittest.cc',
+	    '../../glue/webkit_glue_unittest.cc',
+	    '../../glue/worker_task_runner_unittest.cc',
+	    '../../mocks/mock_resource_loader_bridge.h',
+	    '../../mocks/mock_webframeclient.h',
+	    '../../mocks/mock_weburlloader.cc',
+	    '../../mocks/mock_weburlloader.h',
+	    '../../plugins/ppapi/host_var_tracker_unittest.cc',
+	    '../../plugins/ppapi/mock_platform_image_2d.cc',
+	    '../../plugins/ppapi/mock_platform_image_2d.h',
+	    '../../plugins/ppapi/mock_plugin_delegate.cc',
+	    '../../plugins/ppapi/mock_plugin_delegate.h',
+	    '../../plugins/ppapi/mock_resource.h',
+	    '../../plugins/ppapi/ppb_graphics_2d_impl_unittest.cc',
+	    '../../plugins/ppapi/ppapi_unittest.cc',
+	    '../../plugins/ppapi/ppapi_unittest.h',
+	    '../../plugins/ppapi/quota_file_io_unittest.cc',
+	    '../../user_agent/user_agent_unittest.cc',
+	    '../webcore_unit_tests/BMPImageDecoder_unittest.cpp',
+	    '../webcore_unit_tests/ICOImageDecoder_unittest.cpp',
+	    'image_decoder_unittest.cc',
+	    'image_decoder_unittest.h',
+	    'mock_spellcheck_unittest.cc',
+	    'plugin_tests.cc',
+	    'run_all_tests.cc',
+	    'test_shell_test.cc',
+	    'test_shell_test.h',
+	  ],
+	  'conditions': [
+	    ['OS=="win"', {
+	      'resource_include_dirs': [
+		'<(SHARED_INTERMEDIATE_DIR)/webkit',
+	      ],
+	      'sources': [ '<@(test_shell_windows_resource_files)' ],
+	      'configurations': {
+		'Debug_Base': {
+		  'msvs_settings': {
+		    'VCLinkerTool': {
+		      'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+		    },
+		  },
+		},
+	      },
+	    }],
+	    ['toolkit_uses_gtk == 1', {
+	      'dependencies': [
+		'test_shell_pak',
+		'<(DEPTH)/build/linux/system.gyp:gtk',
+	      ],
+	    }],
+	    ['chromeos==1', {
+	      'sources': [
+		'../../chromeos/fileapi/file_access_permissions_unittest.cc',
+		'../../chromeos/fileapi/memory_file_util.cc',
+		'../../chromeos/fileapi/memory_file_util.h',
+		'../../chromeos/fileapi/memory_file_util_unittest.cc',
+	      ],
+	    }],
+	    ['OS=="mac"', {
+	      # mac tests load the resources from the built test_shell beside the
+	      # test
+	      'dependencies': [
+		'test_shell',
+	       ],
+	      'sources!': [
+		# Disable the image decoder tests because we use CoreGraphics
+		# code on mac and these tests are for the Skia image-decoders.
+		'../webcore_unit_tests/BMPImageDecoder_unittest.cpp',
+		'../webcore_unit_tests/ICOImageDecoder_unittest.cpp',
+		'../webcore_unit_tests/XBMImageDecoder_unittest.cpp',
+		'image_decoder_unittest.cc',
+		'image_decoder_unittest.h',
+	      ],
+	      'sources': [
+	      ],
+	    }],
+	    ['OS=="win"', {
+	      'msvs_disabled_warnings': [ 4800 ],
+	    }],
+	    ['os_posix == 1 and OS != "mac"', {
+	      'conditions': [
+		['linux_use_tcmalloc==1', {
+		  'dependencies': [
+		    '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+		  ],
+		}],
+	      ],
+	    }],
+	  ],
+	},
+      ],
+    }],
     ['target_arch!="arm"', {
       'targets': [
         {