Revert of Extract webkit_unit_tests from blink_web component.

third_party/WebKit/Source/web/web.gyp

 #
 # Copyright (C) 2011 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #         * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #         * Redistributions in binary form must reproduce the above
@@ skipping 39 matching lines @@
     },
     'targets': [
         {
             'target_name': 'blink_web',
             'type': '<(component)',
             'variables': { 'enable_wexit_time_destructors': 1, },
             'dependencies': [
                 '../config.gyp:config',
                 '../platform/blink_platform.gyp:blink_common',
                 '../modules/modules.gyp:modules',
-                '<(DEPTH)/base/base.gyp:base',
                 '<(DEPTH)/cc/cc.gyp:cc',
                 '<(DEPTH)/skia/skia.gyp:skia',
                 '<(angle_path)/src/angle.gyp:translator',
                 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
                 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
                 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
                 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
             ],
             'export_dependent_settings': [
                 '<(DEPTH)/skia/skia.gyp:skia',
                 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
                 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
                 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
             ],
             'include_dirs': [
                 '<(angle_path)/include',
                 '<(DEPTH)/third_party/skia/include/utils',
             ],
             'defines': [
-                'BLINK_WEB_IMPLEMENTATION=1',
                 'BLINK_IMPLEMENTATION=1',
                 'INSIDE_BLINK',
             ],
             'sources': [
                 '<@(web_files)',
             ],
             'conditions': [
                 ['component=="shared_library"', {
                     'dependencies': [
                         '../core/core.gyp:webcore_shared',
+                        '../core/core.gyp:webcore_testing',
+                        '../modules/modules.gyp:modules_testing',
                         '../platform/blink_platform.gyp:blink_common',
                         '../platform/blink_platform.gyp:blink_platform',
+                        '../platform/blink_platform_tests.gyp:blink_platform_test_support',
                         '../wtf/wtf.gyp:wtf',
                         '../wtf/wtf_tests.gyp:wtf_unittest_helpers',
+                        '<(DEPTH)/base/base.gyp:test_support_base',
+                        '<(DEPTH)/testing/gmock.gyp:gmock',
+                        '<(DEPTH)/testing/gtest.gyp:gtest',
                         '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
                         '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
                         '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
                         '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
                         '<(DEPTH)/third_party/ots/ots.gyp:ots',
                         '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
                         '<(DEPTH)/url/url.gyp:url_lib',
                         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
                         '<(libjpeg_gyp_path):libjpeg',
                         # We must not add webkit_support here because of cyclic dependency.
                     ],
                     'export_dependent_settings': [
                         '<(DEPTH)/url/url.gyp:url_lib',
                         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
                     ],
+                    'variables': {
+                      'clang_warning_flags_unset': [
+                        # FIXME: It would be nice to enable this in shared builds too,
+                        # but the test files have global constructors from the GTEST macro
+                        # and we pull in the test files into the blink_web target in the
+                        # shared build.
+                        '-Wglobal-constructors',
+                      ],
+                    },
+                    'sources': [
+                        # Compile Blink unittest files into blink_web.dll in component build mode
+                        '<@(bindings_unittest_files)',
+                        '<@(core_unittest_files)',
+                        '<@(modules_unittest_files)',
+                        # FIXME: the next line should not be needed. We prefer to run these unit tests outside blink_web.dll.
+                        '<@(platform_web_unittest_files)',
+                        '<@(web_unittest_files)',
+                        'WebTestingSupport.cpp',
+                    ],
                     'msvs_settings': {
                       'VCLinkerTool': {
                         'conditions': [
                           ['incremental_chrome_dll==1', {
                             'UseLibraryDependencyInputs': "true",
                           }],
                         ],
                       },
                     },
                 }, {
@@ skipping 47 matching lines @@
                 ['OS=="android"', {
                     'sources/': [
                         ['include', '^linux/WebFontRendering\\.cpp$'],
                     ],
                 }],
             ],
         },
         {
             # GN version: //third_party/WebKit/Source/web:test_support
             'target_name': 'blink_web_test_support',
-            'type': 'static_library',
-            'dependencies': [
-                '../config.gyp:config',
-                '../core/core.gyp:webcore_testing',
-                '../modules/modules.gyp:modules_testing',
-                '../wtf/wtf.gyp:wtf',
-                '<(DEPTH)/skia/skia.gyp:skia',
-                '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
-            ],
-            'include_dirs': [
-                '../../',
-                '<(SHARED_INTERMEDIATE_DIR)/blink',  # gen/blink
-            ],
-            'sources': [
-                'WebTestingSupport.cpp',
-            ],
             'conditions': [
-                ['component!="shared_library"', {
+                ['component=="shared_library"', {
+                    'type': 'none',
+                }, {
+                    'type': 'static_library',
                     'dependencies': [
-                        '../core/core.gyp:webcore',
+                        '../config.gyp:config',
                         '../core/core.gyp:webcore_generated',
+                        '../core/core.gyp:webcore_testing',
+                        '../modules/modules.gyp:modules_testing',
+                        '../wtf/wtf.gyp:wtf',
+                        '<(DEPTH)/skia/skia.gyp:skia',
+                        '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
                     ],
-                }, {
-                    'dependencies': [
-                        '../core/core.gyp:webcore_shared',
+                    'include_dirs': [
+                        '../../',
+                        '<(SHARED_INTERMEDIATE_DIR)/blink',  # gen/blink
+                    ],
+                    'sources': [
+                        'WebTestingSupport.cpp',
                     ],
                 }],
             ],
         },
         {
            'target_name': 'image_decode_bench',
            'type': 'executable',
            'dependencies': [
                '../config.gyp:config',
                '../core/core.gyp:webcore',
@@ skipping 19 matching lines @@
                     'dependencies': ['<(DEPTH)/third_party/mesa/mesa.gyp:osmesa'],
                     'copies': [{
                         'destination': '<(PRODUCT_DIR)/DumpRenderTree.app/Contents/MacOS/',
                         'files': ['<(PRODUCT_DIR)/osmesa.so'],
                     }],
                 },
             ],
         }],
     ], # conditions
 }