Change the name of "component_*" files to "components_*".

This should fix the inconsistency that we have between: components.gyp,
components_tests.gyp, components_unittests.isolate and
component_resources.gyp, component_strings.grd, component_strings.gyp.

This should also please my OCD of auto completion in the command line,
with this it is just a single tab to auto complete all the files
that start with components*.

BUG=None
TEST=gyp
R=blundell@chromium.org
TBR=thestig

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

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

chrome/chrome_browser.gypi

@@ -35,7 +35,6 @@
         'safe_browsing_proto',
         'safe_browsing_report_proto',
         'suggestions_proto',
-        '../components/component_strings.gyp:component_strings',
         '../components/components.gyp:autofill_core_browser',
         '../components/components.gyp:cloud_devices',
         '../components/components.gyp:domain_reliability',
@@ -52,6 +51,7 @@
         '../components/components.gyp:translate_core_browser',
         '../components/components.gyp:translate_core_common',
         '../components/components.gyp:user_prefs',
+        '../components/components_strings.gyp:components_strings',
         # This depends directly on the variations target, rather than just
         # transitively via the common target because the proto sources need to
         # be generated before code in this target can start building.

chrome/chrome_browser_chromeos.gypi

@@ -56,7 +56,7 @@
         # transitively via the common target because the proto sources need to
         # be generated before code in this target can start building.
         '../components/components.gyp:variations',
-        '../components/component_strings.gyp:component_strings',
+        '../components/components_strings.gyp:components_strings',
         '../content/content.gyp:content_browser',
         '../content/content.gyp:content_common',
         '../crypto/crypto.gyp:crypto',

chrome/chrome_browser_extensions.gypi

@@ -29,10 +29,10 @@
         'safe_browsing_proto',
         'sync_file_system_proto',
         '../third_party/re2/re2.gyp:re2',
-        '../components/component_strings.gyp:component_strings',
         '../components/components.gyp:onc_component',
         '../components/components.gyp:url_matcher',
         '../components/components.gyp:wifi_component',
+        '../components/components_strings.gyp:components_strings',
         '../content/content.gyp:content_browser',
         '../content/content.gyp:content_common',
         '../crypto/crypto.gyp:crypto',

chrome/chrome_browser_ui.gypi

@@ -29,13 +29,13 @@
         'safe_browsing_proto',
         'safe_browsing_report_proto',
         'feedback_proto',
-        '../components/component_resources.gyp:component_resources',
-        '../components/component_strings.gyp:component_strings',
         '../components/components.gyp:auto_login_parser',
         '../components/components.gyp:dom_distiller_core',
         '../components/components.gyp:dom_distiller_webui',
         '../components/components.gyp:onc_component',
         '../components/components.gyp:password_manager_core_browser',
+        '../components/components_resources.gyp:components_resources',
+        '../components/components_strings.gyp:components_strings',
         '../content/content.gyp:content_browser',
         '../content/content.gyp:content_common',
         '../crypto/crypto.gyp:crypto',

chrome/chrome_resources.gyp

@@ -70,7 +70,7 @@
       'conditions': [
         ['OS != "ios"', {
           'dependencies': [
-            '../components/component_resources.gyp:component_resources',
+            '../components/components_resources.gyp:components_resources',
             '../content/browser/devtools/devtools_resources.gyp:devtools_resources',
             '../content/browser/tracing/tracing_resources.gyp:tracing_resources',
           ],
@@ -360,7 +360,7 @@
         'chrome_strings',
         'platform_locale_settings',
         'theme_resources',
-        '<(DEPTH)/components/component_strings.gyp:component_strings',
+        '<(DEPTH)/components/components_strings.gyp:components_strings',
         '<(DEPTH)/net/net.gyp:net_resources',
         '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
         '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',

chrome/chrome_tests.gypi

@@ -888,11 +888,11 @@
         '../base/base.gyp:test_support_base',
         '../components/components.gyp:autofill_content_risk_proto',
         '../components/components.gyp:autofill_content_test_support',
-        '../components/components.gyp:dom_distiller_test_support',
         '../components/components.gyp:dom_distiller_content',
+        '../components/components.gyp:dom_distiller_test_support',
         '../components/components.gyp:translate_core_common',
-        '../components/component_resources.gyp:component_resources',
-        '../components/component_strings.gyp:component_strings',
+        '../components/components_resources.gyp:components_resources',
+        '../components/components_strings.gyp:components_strings',
         '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
         '../extensions/common/api/api.gyp:extensions_api',
         '../google_apis/google_apis.gyp:google_apis_test_support',

chrome/chrome_tests_unit.gypi

@@ -498,7 +498,7 @@
         '<@(chromium_child_dependencies)',
         # 2) test-specific support libraries:
         '../base/base.gyp:test_support_base',
-        '../components/component_resources.gyp:component_resources',
+        '../components/components_resources.gyp:components_resources',
         '../content/content.gyp:content_app_both',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
@@ -1997,9 +1997,8 @@
       'conditions': [
         ['OS!="ios"', {
           'dependencies': [
-            'common/extensions/api/api.gyp:chrome_api',
             '../components/components.gyp:autofill_content_test_support',
-            '../components/component_strings.gyp:component_strings',
+            '../components/components_strings.gyp:components_strings',
             '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
             '../gpu/gpu.gyp:gpu_unittest_utils',
             '../media/media.gyp:media_test_support',
@@ -2012,6 +2011,7 @@
             '../ui/gl/gl.gyp:gl',
             '../v8/tools/gyp/v8.gyp:v8',
             '../webkit/webkit_resources.gyp:webkit_resources',
+            'common/extensions/api/api.gyp:chrome_api',
           ],
           # TODO(scr): Use this in browser_tests too.
           'includes': [

components/autofill.gypi

@@ -101,8 +101,8 @@
         '../url/url.gyp:url_lib',
         'autofill_core_common',
         'autofill_regexes',
-        'component_resources.gyp:component_resources',
-        'component_strings.gyp:component_strings',
+        'components_resources.gyp:components_resources',
+        'components_strings.gyp:components_strings',
         'os_crypt',
         'user_prefs',
         'webdata_common',
@@ -345,8 +345,8 @@
             'autofill_core_browser',
             'autofill_core_common',
             'autofill_regexes',
-            'component_resources.gyp:component_resources',
-            'component_strings.gyp:component_strings',
+            'components_resources.gyp:components_resources',
+            'components_strings.gyp:components_strings',
             'os_crypt',
             'user_prefs',
             'webdata_common',
@@ -392,16 +392,15 @@
             '..',
           ],
           'dependencies': [
-            'autofill_content_common',
-            'autofill_core_common',
             '../base/base.gyp:base',
-            '../content/content.gyp:content_renderer',
             '../content/content.gyp:content_common',
+            '../content/content.gyp:content_renderer',
             '../ipc/ipc.gyp:ipc',
             '../skia/skia.gyp:skia',
             '../third_party/WebKit/public/blink.gyp:blink',
-
-            'component_strings.gyp:component_strings',
+            'autofill_content_common',
+            'autofill_core_common',
+            'components_strings.gyp:components_strings',
           ],
           'sources': [
             'autofill/content/renderer/autofill_agent.cc',

components/component_resources.gyp → components/components_resources.gyp

@@ -5,23 +5,23 @@
 {
   'targets': [
     {
-      'target_name': 'component_resources',
+      'target_name': 'components_resources',
       'type': 'none',
       'variables': {
         'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/components',
       },
       'actions': [
         {
-          'action_name': 'generate_component_resources',
+          'action_name': 'generate_components_resources',
           'variables': {
-            'grit_grd_file': 'resources/component_resources.grd',
+            'grit_grd_file': 'resources/components_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
-          'action_name': 'generate_component_scaled_resources',
+          'action_name': 'generate_components_scaled_resources',
           'variables': {
-            'grit_grd_file': 'resources/component_scaled_resources.grd',
+            'grit_grd_file': 'resources/components_scaled_resources.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },

components/component_strings.gyp → components/components_strings.gyp

@@ -1,17 +1,17 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2014 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.
 
 {
   'targets': [
     {
-      'target_name': 'component_strings',
+      'target_name': 'components_strings',
       'type': 'none',
       'actions': [
         {
-          'action_name': 'component_strings',
+          'action_name': 'generate_components_strings',
           'variables': {
-            'grit_grd_file': 'component_strings.grd',
+            'grit_grd_file': 'components_strings.grd',
             'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/components/strings',
           },
           'includes': [ '../build/grit_action.gypi' ],

components/components_tests.gyp

@@ -150,7 +150,7 @@
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/gfx/gfx.gyp:gfx',
 
-            'component_resources.gyp:component_resources',
+            'components_resources.gyp:components_resources',
 
             # Dependencies of auto_login_parser
             'components.gyp:auto_login_parser',
@@ -159,7 +159,7 @@
             'components.gyp:autofill_core_browser',
             'components.gyp:autofill_core_common',
             'components.gyp:autofill_core_test_support',
-            'component_strings.gyp:component_strings',
+            'components_strings.gyp:components_strings',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
 
             # Dependencies of cloud_devices

components/dom_distiller.gypi

@@ -10,14 +10,14 @@
           'target_name': 'dom_distiller_webui',
           'type': 'static_library',
           'dependencies': [
-            'component_resources.gyp:component_resources',
-            'component_strings.gyp:component_strings',
-            'distilled_page_proto',
-            'dom_distiller_core',
             '../base/base.gyp:base',
             '../content/content.gyp:content_browser',
             '../skia/skia.gyp:skia',
             '../sync/sync.gyp:sync',
+            'components_resources.gyp:components_resources',
+            'components_strings.gyp:components_strings',
+            'distilled_page_proto',
+            'dom_distiller_core',
           ],
           'include_dirs': [
             '..',
@@ -33,13 +33,13 @@
           'target_name': 'dom_distiller_core',
           'type': 'static_library',
           'dependencies': [
-            'component_resources.gyp:component_resources',
-            'distilled_page_proto',
             '../base/base.gyp:base',
             '../skia/skia.gyp:skia',
             '../sync/sync.gyp:sync',
-            '../third_party/protobuf/protobuf.gyp:protobuf_lite',
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+            '../third_party/protobuf/protobuf.gyp:protobuf_lite',
+            'components_resources.gyp:components_resources',
+            'distilled_page_proto',
           ],
           'include_dirs': [
             '..',
@@ -133,13 +133,13 @@
               'target_name': 'dom_distiller_content',
               'type': 'static_library',
               'dependencies': [
-                'component_resources.gyp:component_resources',
-                'component_strings.gyp:component_strings',
-                'dom_distiller_core',
                 '../content/content.gyp:content_browser',
                 '../net/net.gyp:net',
                 '../skia/skia.gyp:skia',
                 '../sync/sync.gyp:sync',
+                'components_resources.gyp:components_resources',
+                'components_strings.gyp:components_strings',
+                'dom_distiller_core',
               ],
               'include_dirs': [
                 '..',

components/policy/policy_browser.gypi

@@ -10,7 +10,7 @@
     '../net/net.gyp:net',
     '../ui/base/ui_base.gyp:ui_base',
     '../url/url.gyp:url_lib',
-    'component_strings.gyp:component_strings',
+    'components_strings.gyp:components_strings',
     'user_prefs',
   ],
   'defines': [

components/translate.gypi

@@ -13,7 +13,7 @@
         '../net/net.gyp:net',
         '../ui/base/ui_base.gyp:ui_base',
         '../url/url.gyp:url_lib',
-        'component_resources.gyp:component_resources',
+        'components_resources.gyp:components_resources',
         'language_usage_metrics',
         'translate_core_common',
         'user_prefs',

tools/gritsettings/resource_ids

@@ -186,13 +186,13 @@
   "third_party/libaddressinput/chromium/cpp/res/messages.grd": {
     "messages": [29050],
   },
-  "components/component_strings.grd": {
+  "components/components_strings.grd": {
     "messages": [30000],
   },
-  "components/resources/component_resources.grd": {
+  "components/resources/components_resources.grd": {
     "includes": [30250],
   },
-  "components/resources/component_scaled_resources.grd": {
+  "components/resources/components_scaled_resources.grd": {
     "structures": [30350],
   },
   "third_party/WebKit/public/blink_resources.grd": {