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

chrome/test/gpu/test_support_gpu.gypi

 # Copyright (c) 2012 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.
 
 # This file is meant to be included into targets which run gpu tests.
 {
   'variables': {
      'test_list_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome/test/gpu',
      'src_dir': '../../..',
   },
@@ skipping 38 matching lines @@
         '<(DEPTH)/third_party/wtl/include',
       ],
       'sources': [
         '<(src_dir)/chrome/app/chrome_dll.rc',
         '<(src_dir)/chrome/app/chrome_dll_resource.h',
         '<(src_dir)/chrome/app/chrome_version.rc.version',
         '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
         '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
         '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
         '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
       ],
       'conditions': [
         ['win_use_allocator_shim==1', {
           'dependencies': [
             '<(allocator_target)',
           ],
         }],
       ],
@@ skipping 21 matching lines @@
         '<(src_dir)/build/linux/system.gyp:ssl',
       ],
     }],
     ['toolkit_views==1', {
       'dependencies': [
        '<(src_dir)/ui/views/views.gyp:views',
       ],
     }],
   ],
 }