Merge grd files in ui/resources and chrome/app/theme

ui/ui_resources.gypi

Index: ui/ui_resources.gypi
diff --git a/ui/ui_resources.gypi b/ui/ui_resources.gypi
index 78d639e661bfe286080a93b54f3bcabae1148cc8..a872ec86eaa210ce99cc62f10edafd89bbc9920c 100644
--- a/ui/ui_resources.gypi
+++ b/ui/ui_resources.gypi
@@ -19,30 +19,13 @@
           'includes': [ '../build/grit_action.gypi' ],
         },
       ],
-      'includes': [ '../build/grit_target.gypi' ],
-    },
-    {
-      'target_name': 'ui_resources_standard',
-      'type': 'none',
-      'variables': {
-        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard',
-      },
-      'actions': [
-        {
-          'action_name': 'ui_resources_standard',
-          'variables': {
-            'grit_grd_file': 'resources/ui_resources_standard.grd',
-          },
-          'includes': [ '../build/grit_action.gypi' ],
-        },
-      ],
       # gfx_resources.pak is used by DumpRenderTree.
       # TODO(oshima): Update DumpRenderTree.gyp to use new pak file and
       # remove this.
       'copies': [ {
           'destination': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/',
           'files' : [
-             '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/gfx_resources.pak',
+             '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/gfx_resources.pak',
           ],
         },
       ],