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

webkit/tools/test_shell/test_shell.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.
 
 {
   'variables': {
     'test_shell_windows_resource_files': [
       'resources/test_shell.rc',
       '../../glue/resources/pan_east.cur',
       '../../glue/resources/pan_middle.cur',
@@ skipping 154 matching lines @@
         'repack_path': '../../../tools/grit/grit/format/repack.py',
         'pak_path': '<(INTERMEDIATE_DIR)/repack/test_shell.pak',
       },
       'conditions': [
         ['os_posix == 1 and OS != "mac"', {
           'actions': [
             {
               'action_name': 'test_shell_repack',
               'variables': {
                 'pak_inputs': [
-                  '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/test_shell/test_shell_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
                 ],
               },
               'inputs': [
                 '<(repack_path)',
                 '<@(pak_inputs)',
               ],
               'outputs': [
@@ skipping 127 matching lines @@
             {
               # Copy FFmpeg binaries for audio/video support.
               'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/MacOS/',
               'files': [
                 '<(PRODUCT_DIR)/ffmpegsumo.so',
               ],
             },
           ],
         }, { # OS != "mac"
           'dependencies': [
-            '<(DEPTH)/ui/ui.gyp:ui_resources_standard',
             '<(DEPTH)/net/net.gyp:net_resources',
+            '<(DEPTH)/ui/ui.gyp:ui_resources',
             '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
             '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
           ]
         }],
       ],
     },
     {
       'target_name': 'test_shell_test_support',
       'type': 'static_library',
       'dependencies': [
@@ skipping 298 matching lines @@
               'action_name': 'test_shell_resources',
               'includes': [ '../../../build/grit_action.gypi' ],
             },
           ],
           'includes': [ '../../../build/grit_target.gypi' ],
         },
       ],
     }],
   ],
 }