Revert 107967 - Introduces chromium_resources.gyp to factor out Chrome resource generation

chrome/chrome_tests.gypi

 # Copyright (c) 2011 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' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
       'common/pref_names.h',
       'test/automation/browser_proxy.cc',
       'test/automation/browser_proxy.h',
@@ skipping 12 matching lines @@
       }],
     ],
   },
   'targets': [
     {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
       'type': 'static_library',
       'dependencies': [
-        'app/policy/cloud_policy_codegen.gyp:policy',
         'browser',
-        'browser/sync/protocol/sync_proto.gyp:sync_proto',
-        'chrome_resources.gyp:chrome_resources',
-        'chrome_resources.gyp:chrome_strings',
-        'chrome_resources.gyp:theme_resources',
         'common',
+        'renderer',
         'plugin',
-        'renderer',
         'service',
         'utility',
+        'chrome_resources',
+        'chrome_strings',
+        'app/policy/cloud_policy_codegen.gyp:policy',
+        'browser/sync/protocol/sync_proto.gyp:sync_proto',
+        'theme_resources',
         '../base/base.gyp:test_support_base',
         '../content/content.gyp:content_app',
         '../content/content.gyp:content_gpu',
         '../content/content.gyp:content_plugin',
         '../content/content.gyp:content_ppapi_plugin',
         '../content/content.gyp:content_renderer',
         '../content/content.gyp:content_utility',
         '../content/content.gyp:content_worker',
         '../content/content.gyp:test_support_content',
         '../ipc/ipc.gyp:test_support_ipc',
@@ skipping 201 matching lines @@
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
         }],
       ],
     },
     {
       'target_name': 'test_support_ui',
       'type': 'static_library',
       'dependencies': [
-        'chrome_resources.gyp:chrome_resources',
-        'chrome_resources.gyp:chrome_strings',
-        'chrome_resources.gyp:theme_resources',
         'test_support_common',
+        'chrome_resources',
+        'chrome_strings',
+        'theme_resources',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'export_dependent_settings': [
         'test_support_common',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
@@ skipping 109 matching lines @@
       ],
       'sources': [
         'browser/sync/notifier/mock_sync_notifier_observer.cc',
         'browser/sync/notifier/mock_sync_notifier_observer.h',
       ],
     },
     {
       'target_name': 'test_support_unit',
       'type': 'static_library',
       'dependencies': [
-        'chrome_resources.gyp:chrome_resources',
-        'chrome_resources.gyp:chrome_strings',
         'test_support_common',
+        'chrome_resources',
+        'chrome_strings',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/base/run_all_unittests.cc',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             # Needed for the following #include chain:
             #   test/base/run_all_unittests.cc
             #   test/base/chrome_test_suite.h
             #   gtk/gtk.h
             '../build/linux/system.gyp:gtk',
           ],
         }],
       ],
     },
     {
       'target_name': 'automated_ui_tests',
       'type': 'executable',
       'dependencies': [
         'browser',
-        'chrome_resources.gyp:theme_resources',
         'renderer',
         'test_support_common',
         'test_support_ui',
+        'theme_resources',
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../third_party/libxml/libxml.gyp:libxml',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/reliability/automated_ui_test_interactive_test.cc',
@@ skipping 30 matching lines @@
           ],
         }],
       ],
     },
     {
       'target_name': 'interactive_ui_tests',
       'type': 'executable',
       'dependencies': [
         'browser/sync/protocol/sync_proto.gyp:sync_proto',
         'chrome',
-        'chrome_resources.gyp:chrome_resources',
-        'chrome_resources.gyp:chrome_strings',
+        'chrome_resources',
+        'chrome_strings',
         'debugger',
         'syncapi_core',
         'test_support_common',
         'test_support_ui',
         '../third_party/hunspell/hunspell.gyp:hunspell',
         '../net/net.gyp:net',
         '../net/net.gyp:net_resources',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
@@ skipping 179 matching lines @@
           'sources!': [
             'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
           ],
         }],  # OS != "win"
       ],  # conditions
     },
     {
       'target_name': 'ui_tests',
       'type': 'executable',
       'dependencies': [
+        'chrome',
         'browser',
-        'chrome',
-        'chrome_resources.gyp:chrome_resources',
-        'chrome_resources.gyp:chrome_strings',
         'common',
+        'chrome_resources',
+        'chrome_strings',
         'test_support_ui',
         '../base/base.gyp:base',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
@@ skipping 170 matching lines @@
       ],
     },
     {
       # chromedriver is the chromium implementation of WebDriver.
       # See http://www.chromium.org/developers/testing/webdriver-for-chrome
       'target_name': 'chromedriver_lib',
       'type': 'static_library',
       'dependencies': [
         'browser',
         'chrome',
-        'chrome_resources.gyp:chrome_resources',
-        'chrome_resources.gyp:chrome_strings',
+        'chrome_resources',
+        'chrome_strings',
         'chromedriver_support',
         'common',
         'syncapi_core',
         'test_support_ui',
         '../base/base.gyp:base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
@@ skipping 222 matching lines @@
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '../third_party/libjingle/libjingle.gyp:libjingle',
         '../third_party/libxml/libxml.gyp:libxml',
         '../ui/gfx/gl/gl.gyp:gl',
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_resources_standard',
         '../ui/ui.gyp:ui_test_support',
         '../v8/tools/gyp/v8.gyp:v8',
-        'chrome_resources.gyp:chrome_resources',
-        'chrome_resources.gyp:chrome_strings',
+        'chrome_resources',
+        'chrome_strings',
       ],
       'include_dirs': [
         '..',
       ],
       'defines': [
         'CLD_WINDOWS',
       ],
       'direct_dependent_settings': {
         'defines': [
           'CLD_WINDOWS',
@@ skipping 1013 matching lines @@
           # The Mac linker isn't so sensitive that moving this library to the
           # front of the list will cause problems.
           #
           # Enough pluses to make get this target prepended to the target's
           # list of dependencies.
           'dependencies+++': [
             '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore',
           ],
         }, { # OS != "mac"
           'dependencies': [
-            'chrome_resources.gyp:packed_extra_resources',
-            'chrome_resources.gyp:packed_resources',
             'convert_dict_lib',
+            'packed_extra_resources',
+            'packed_resources',
             '../third_party/hunspell/hunspell.gyp:hunspell',
           ],
           'sources!': [
             'browser/spellchecker/spellchecker_platform_engine_unittest.cc',
           ],
         }],
         ['OS=="win"', {
           'dependencies': [
             'chrome_version_resources',
             'installer_util_strings',
@@ skipping 102 matching lines @@
         'gypv8sh': '../tools/gypv8sh.py',
         'js2webui': 'browser/ui/webui/javascript2webui.js',
         'js2webui_out_dir': '<(SHARED_INTERMEDIATE_DIR)/js2webui',
         'mock_js': 'third_party/mock4js/mock4js.js',
         'test_api_js': 'test/data/webui/test_api.js',
       },
       'dependencies': [
         'browser',
         'browser/sync/protocol/sync_proto.gyp:sync_proto',
         'chrome',
-        'chrome_resources.gyp:chrome_resources',
-        'chrome_resources.gyp:chrome_strings',
+        'chrome_resources',
+        'chrome_strings',
         'renderer',
         'test_support_common',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
@@ skipping 648 matching lines @@
       # To run the tests from page_load_test.cc on Linux, we need to:
       #
       #   a) Build with Breakpad (GYP_DEFINES="linux_chromium_breakpad=1")
       #   b) Run with CHROME_HEADLESS=1 to generate crash dumps.
       #   c) Strip the binary if it's a debug build. (binary may be over 2GB)
       'target_name': 'reliability_tests',
       'type': 'executable',
       'dependencies': [
         'browser',
         'chrome',
-        'chrome_resources.gyp:theme_resources',
         'test_support_common',
         'test_support_ui',
+        'theme_resources',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/reliability/page_load_test.cc',
       ],
@@ skipping 28 matching lines @@
             '../build/linux/system.gyp:gtk',
           ],
         },],
       ],
     },
     {
       'target_name': 'performance_ui_tests',
       'type': 'executable',
       'dependencies': [
         'chrome',
-        'chrome_resources.gyp:chrome_resources',
-        'chrome_resources.gyp:chrome_strings',
+        'chrome_resources',
+        'chrome_strings',
         'debugger',
         'test_support_common',
         'test_support_ui',
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
         # TODO(darin): Move other UIPerfTests here.
         'test/perf/dom_checker_uitest.cc',
@@ skipping 212 matching lines @@
           # See the comment in this section of the unit_tests target for an
           # explanation (crbug.com/43791 - libwebcore.a is too large to mmap).
           'dependencies+++': [
             '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore',
           ],
           'dependencies': [
             'helper_app'
           ],
         },{  # OS!="mac"
           'dependencies': [
-            'chrome_resources.gyp:packed_extra_resources',
-            'chrome_resources.gyp:packed_resources'
+            'packed_extra_resources',
+            'packed_resources'
           ],
         }],
         ['OS=="linux" and chromeos==1', {
           'include_dirs': [
             '<(grit_out_dir)',
           ],
         }],
       ],
     },
     {
       'target_name': 'sync_integration_tests',
       'type': 'executable',
       'dependencies': [
         'browser',
         'browser/sync/protocol/sync_proto.gyp:sync_proto',
         'chrome',
-        'chrome_resources.gyp:chrome_resources',
-        'chrome_resources.gyp:chrome_strings',
+        'chrome_resources',
         'common',
         'renderer',
+        'chrome_strings',
         'test_support_common',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/npapi/npapi.gyp:npapi',
@@ skipping 272 matching lines @@
     {
       # Executable that contains all the tests to be run on the GPU bots.
       'target_name': 'gpu_tests',
       'type': 'executable',
       'variables': {
         'test_list_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome/test/gpu',
       },
       'dependencies': [
         'browser',
         'chrome',
-        'chrome_resources.gyp:chrome_resources',
-        'chrome_resources.gyp:chrome_strings',
+        'chrome_resources',
+        'chrome_strings',
         'renderer',
         'test_support_common',
         'test_support_ui',
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
@@ skipping 86 matching lines @@
             '../views/views.gyp:views',
           ],
         }],
       ],
     },
     {
       'target_name': 'plugin_tests',
       'type': 'executable',
       'dependencies': [
         'chrome',
-        'chrome_resources.gyp:chrome_resources',
-        'chrome_resources.gyp:chrome_strings',
+        'chrome_resources',
+        'chrome_strings',
         'test_support_common',
         'test_support_ui',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         '../third_party/libxslt/libxslt.gyp:libxslt',
         '../third_party/npapi/npapi.gyp:npapi',
       ],
       'include_dirs': [
         '..',
       ],
@@ skipping 50 matching lines @@
         },
       ],
     }],
     ['OS!="mac"', {
       'targets': [
         {
           'target_name': 'perf_tests',
           'type': 'executable',
           'dependencies': [
             'browser',
-            'chrome_resources.gyp:chrome_resources',
-            'chrome_resources.gyp:chrome_strings',
             'common',
             'renderer',
+            'chrome_resources',
+            'chrome_strings',
             '../content/content.gyp:content_gpu',
             '../content/content.gyp:test_support_content',
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
             '../base/base.gyp:test_support_perf',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
             '../webkit/support/webkit_support.gyp:glue',
           ],
           'sources': [
@@ skipping 105 matching lines @@
     # for the chromium_builder_qa target.
     ['OS == "mac" or OS == "win" or (os_posix == 1 and target_arch == python_arch)', {
       'targets': [
         {
           # Documentation: http://dev.chromium.org/developers/testing/pyauto
           'target_name': 'pyautolib',
           'type': 'loadable_module',
           'product_prefix': '_',
           'dependencies': [
             'chrome',
-            'chrome_resources.gyp:chrome_resources',
-            'chrome_resources.gyp:chrome_strings',
-            'chrome_resources.gyp:theme_resources',
             'debugger',
             'syncapi_core',
             'test_support_common',
+            'chrome_resources',
+            'chrome_strings',
+            'theme_resources',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
           ],
           'export_dependent_settings': [
             'test_support_common',
           ],
           'include_dirs': [
             '..',
           ],
           'cflags': [
@@ skipping 270 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }