Merge theme_resources_large and theme_resources_standard targets

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',
@@ skipping 13 matching lines @@
       'type': 'static_library',
       'dependencies': [
         'browser',
         'common',
         'renderer',
         'chrome_resources',
         'chrome_strings',
         'app/policy/cloud_policy_codegen.gyp:policy',
         'browser/sync/protocol/sync_proto.gyp:sync_proto',
         'theme_resources',
-        'theme_resources_standard',
         '../base/base.gyp:test_support_base',
         '../content/content.gyp:content_gpu',
         '../content/content.gyp:test_support_content',
         '../ipc/ipc.gyp:test_support_ipc',
         '../media/media.gyp:media_test_support',
         '../net/net.gyp:net',
         # 'test/base/test_url_request_context_getter.h' brings in this requirement.
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
@@ skipping 183 matching lines @@
       ],
     },
     {
       'target_name': 'test_support_ui',
       'type': 'static_library',
       'dependencies': [
         'test_support_common',
         'chrome_resources',
         'chrome_strings',
         'theme_resources',
-        'theme_resources_standard',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'export_dependent_settings': [
         'test_support_common',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
@@ skipping 142 matching lines @@
     },
     {
       'target_name': 'automated_ui_tests',
       'type': 'executable',
       'dependencies': [
         'browser',
         'renderer',
         'test_support_common',
         'test_support_ui',
         'theme_resources',
-        'theme_resources_standard',
         '../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 2331 matching lines @@
       #   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',
         'test_support_common',
         'test_support_ui',
         'theme_resources',
-        'theme_resources_standard',
         '../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 850 matching lines @@
           'type': 'loadable_module',
           'product_prefix': '_',
           'dependencies': [
             'chrome',
             'debugger',
             'syncapi_core',
             'test_support_common',
             'chrome_resources',
             'chrome_strings',
             'theme_resources',
-            'theme_resources_standard',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
           ],
           'export_dependent_settings': [
             'test_support_common',
           ],
           'include_dirs': [
             '..',
           ],
           'cflags': [
@@ skipping 265 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'
 }