Revert of Revert of Eliminate components_unittests' dependence on chrome resources.

components/components_tests.gyp

 # 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.
 
 {
   'variables': {
     # This turns on e.g. the filename-based detection of which
     # platforms to include source files on (e.g. files ending in
     # _mac.h or _mac.cc are only compiled on MacOSX).
     'chromium_code': 1,
@@ skipping 293 matching lines @@
             'web_resource/eula_accepted_notifier_unittest.cc',
             'web_resource/resource_request_allowed_notifier_unittest.cc',
             'webdata/common/web_database_migration_unittest.cc',
           ],
           'include_dirs': [
             '..',
           ],
           'dependencies': [
             '../base/base.gyp:base_prefs_test_support',
             '../base/base.gyp:test_support_base',
-            # TODO(blundell): Eliminate this dependency by having
-            # components_unittests have its own pakfile. crbug.com/348563
-            '../chrome/chrome_resources.gyp:packed_extra_resources',
             # TODO(blundell): Eliminate the need for this dependency in code
             # that iOS shares. crbug.com/325243
             '../content/content_shell_and_tests.gyp:test_support_content',
             '../sql/sql.gyp:test_support_sql',
             '../sync/sync.gyp:sync',
             '../sync/sync.gyp:test_support_sync_api',
             '../testing/gmock.gyp:gmock',
             '../testing/gtest.gyp:gtest',
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_test_support',
+            '../ui/resources/ui_resources.gyp:ui_resources',
+            '../ui/strings/ui_strings.gyp:ui_strings',
 
             'components_resources.gyp:components_resources',
 
             # Dependencies of auto_login_parser
             'components.gyp:auto_login_parser',
 
             # Dependencies of autofill
             'components.gyp:autofill_core_browser',
             'components.gyp:autofill_core_common',
             'components.gyp:autofill_core_test_support',
@@ skipping 171 matching lines @@
 
             # Dependencies of variations
             'components.gyp:variations',
             'components.gyp:variations_http_provider',
 
             # Dependencies of web_resource
             'components.gyp:web_resource',
             'components.gyp:web_resource_test_support',
             '../base/base.gyp:base',
           ],
+          'actions': [
+            {
+              'action_name': 'repack_components_pak',
+              'variables': {
+                'pak_inputs': [
+                  '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_en-US.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
+                ],
+                'pak_output': '<(PRODUCT_DIR)/components_unittests_resources.pak',
+              },
+              'includes': [ '../build/repack_action.gypi' ],
+            },
+          ],
+          'mac_bundle_resources': [
+            '<(PRODUCT_DIR)/components_unittests_resources.pak',
+          ],
           'conditions': [
             ['toolkit_views == 1', {
               'sources': [
                 'bookmarks/browser/bookmark_node_data_unittest.cc',
                 'constrained_window/constrained_window_views_unittest.cc',
               ],
               'dependencies': [
                 '<(DEPTH)/ui/views/views.gyp:views_test_support',
                 'components.gyp:constrained_window',
               ]
@@ skipping 85 matching lines @@
                 'components.gyp:web_modal_test_support',
               ],
               'conditions': [
                 ['OS != "android"', {
                   'sources': [
                     'sessions/session_backend_unittest.cc',
                    ],
                 }],
               ],
             }, { # 'OS == "ios"'
-              'includes': ['../chrome/chrome_ios_bundle_resources.gypi'],
               'sources': [
                 'webp_transcode/webp_decoder_unittest.mm',
               ],
               'sources/': [
                 ['exclude', '\\.cc$'],
                 ['exclude', '\\.mm$'],
                 ['include', '^test/run_all_unittests\\.cc$'],
                 ['include', '^auto_login_parser/'],
                 ['include', '^autofill/core/'],
                 ['include', '^bookmarks/'],
@@ skipping 421 matching lines @@
             'HAS_OUT_OF_PROC_TEST_RUNNER',
           ],
           'sources': [
             'autofill/content/browser/risk/fingerprint_browsertest.cc',
             'autofill/content/renderer/password_form_conversion_utils_browsertest.cc',
             'dom_distiller/content/distiller_page_web_contents_browsertest.cc',
             'password_manager/content/renderer/credential_manager_client_browsertest.cc',
           ],
           'actions': [
             {
-              'action_name': 'repack_components_pack',
+              'action_name': 'repack_components_pak',
               'variables': {
                 'pak_inputs': [
                   '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_en-US.pak',
                 ],
                 'pak_output': '<(PRODUCT_DIR)/components_resources.pak',
               },
               'includes': [ '../build/repack_action.gypi' ],
             },
           ],
@@ skipping 67 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'components_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }