Merge theme_resources_large and theme_resources_standard targets

chrome/chrome.gyp

Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 205087ca820ccd0df8d9218c350171ef03424b39..d99834ef01f08dc57c3ab9879910afcf1cd68bc0 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -229,13 +229,6 @@
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
-      ],
-      'includes': [ '../build/grit_target.gypi' ],
-    },
-    {
-      'target_name': 'theme_resources_large',
-      'type': 'none',
-      'actions': [
         {
           'action_name': 'theme_resources_large',
           'variables': {
@@ -243,13 +236,6 @@
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
-      ],
-      'includes': [ '../build/grit_target.gypi' ],
-    },
-    {
-      'target_name': 'theme_resources_standard',
-      'type': 'none',
-      'actions': [
         {
           'action_name': 'theme_resources_standard',
           'variables': {
@@ -405,7 +391,6 @@
         'chrome_resources',
         'chrome_strings',
         'theme_resources',
-        'theme_resources_standard',
         '../base/base.gyp:base',
         '../content/content.gyp:content_browser',
         '../net/net.gyp:http_server',
@@ -1485,7 +1470,6 @@
           'type': 'static_library',
           'dependencies': [
             'theme_resources',
-            'theme_resources_standard',
             '../base/base.gyp:test_support_base',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
@@ -1589,8 +1573,6 @@
           'default_plugin/default_plugin.gyp:default_plugin_resources',
           'platform_locale_settings',
           'theme_resources',
-          'theme_resources_standard',
-          'theme_resources_large',
           '<(DEPTH)/net/net.gyp:net_resources',
           '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
           '<(DEPTH)/ui/ui.gyp:gfx_resources',