Simplify content_shell_resources target.

Looks simpler that way instead of having the action that generates the
pak file and the header files separated.

BUG=None
TEST=None
R=jamescook@chromium.org,jochen@chromium.org

Review URL: https://codereview.chromium.org/273783002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269706 0039d316-1c4b-4281-b951-d872f2087c98

apps/shell/app_shell.gyp

@@ -31,7 +31,7 @@
         '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
         # Need dev-tools related resources in shell_resources.pak and
         # devtools_resources.pak.
-        '<(DEPTH)/content/content_shell_and_tests.gyp:generate_content_shell_resources',
+        '<(DEPTH)/content/content_shell_and_tests.gyp:content_shell_resources',
         '<(DEPTH)/content/browser/devtools/devtools_resources.gyp:devtools_resources',
         '<(DEPTH)/extensions/extensions_resources.gyp:extensions_resources',
         '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',

content/content_shell.gypi

@@ -364,12 +364,18 @@
     {
       'target_name': 'content_shell_resources',
       'type': 'none',
-      'dependencies': [
-        'generate_content_shell_resources',
-      ],
       'variables': {
         'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content',
       },
+      'actions': [
+        {
+          'action_name': 'generate_content_shell_resources',
+          'variables': {
+            'grit_grd_file': 'shell/shell_resources.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
+      ],
       'includes': [ '../build/grit_target.gypi' ],
       'copies': [
         {
@@ -417,22 +423,6 @@
         }],
       ],
     },
-    {
-      'target_name': 'generate_content_shell_resources',
-      'type': 'none',
-      'variables': {
-        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content',
-      },
-      'actions': [
-        {
-          'action_name': 'content_shell_resources',
-          'variables': {
-            'grit_grd_file': 'shell/shell_resources.grd',
-          },
-          'includes': [ '../build/grit_action.gypi' ],
-        },
-      ],
-    },
     {
       # We build a minimal set of resources so WebKit in content_shell has
       # access to necessary resources.