Move image decoder unit tests to content_unittests

webkit/tools/test_shell/test_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': {
     'test_shell_windows_resource_files': [
       'resources/test_shell.rc',
       '../../glue/resources/pan_east.cur',
       '../../glue/resources/pan_middle.cur',
@@ skipping 376 matching lines @@
             '../../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/ppapi_plugin_instance_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',
@@ skipping 22 matching lines @@
                 '../../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"', {
               # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
               'msvs_disabled_warnings': [ 4800, 4267 ],
             }],
             ['os_posix == 1 and OS != "mac"', {
               'conditions': [
                 ['linux_use_tcmalloc==1', {
                   'dependencies': [
                     '<(DEPTH)/base/allocator/allocator.gyp:allocator',
@@ skipping 173 matching lines @@
               'action_name': 'test_shell_resources',
               'includes': [ '../../../build/grit_action.gypi' ],
             },
           ],
           'includes': [ '../../../build/grit_target.gypi' ],
         },
       ],
     }],
   ],
 }