Build components.gyp:* and components_test.gyp:* on iOS.

components/components_tests.gyp

Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 81e65a48aee14d43f09a65b555a755d548887e8d..4e959826d33105a33cdc8c43aca49a89ce8e8c8f 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -59,20 +59,16 @@
           ],
           'dependencies': [
             '../base/base.gyp:test_support_base',
+            # TODO(blundell): What is the right thing to do here in the long
+            # term?
+            '../content/content_shell_and_tests.gyp:test_support_content',

[blundell, 2013/12/03 14:00:23]

This dependency is needed because run_all_unittests.cc sets up a test content
client. I think the right approach is probably to have (at least) two sets of
components unittests: (1) core unittests with a run_core_unittests.cc file that
doesn't mention //content, and (2) content unittests with a
run_content_unittests.cc file that sets up the test content client. I'd prefer
to not do that separation in this CL, though. If you agree, I'll file a bug and
reference it here.

[Jói, 2013/12/03 15:49:59]

That seems right to me. Fine to do in a separate CL.

[blundell, 2013/12/03 16:42:00]

Filed crbug.com/325243 against myself.

On 2013/12/03 15:49:59, Jói wrote:

             '../sync/sync.gyp:sync',
             '../testing/gmock.gyp:gmock',
             '../testing/gtest.gyp:gtest',
 
-            # Dependencies of autofill
-            'components.gyp:autofill_core_browser',
-            'components.gyp:autofill_core_common',
-
             # Dependencies of auto_login_parser
             'components.gyp:auto_login_parser',
 
-            # Dependencies of browser_context_keyed_service
-            'components.gyp:browser_context_keyed_service',
-
             # Dependencies of dom_distiller
             'components.gyp:distilled_page_proto',
             'components.gyp:dom_distiller_core',
@@ -83,11 +79,6 @@
             # Dependencies of json_schema
             'components.gyp:json_schema',
 
-            # Dependencies of intercept_navigation_resource_throttle_unittest.cc
-            '../content/content_shell_and_tests.gyp:test_support_content',
-            '../skia/skia.gyp:skia',
-            'components.gyp:navigation_interception',
-
             # Dependencies of policy
             'components.gyp:policy_component',
 
@@ -95,42 +86,55 @@
             'components.gyp:precache_core',
             'components.gyp:precache_core_proto',
 
-            # Dependencies of sessions
-            '../third_party/protobuf/protobuf.gyp:protobuf_lite',
-            'components.gyp:sessions',
-            'components.gyp:sessions_test_support',
-
             # Dependencies of translate.
             'components.gyp:translate_common',
             'components.gyp:translate_language_detection',
 
             # Dependencies of variations
             'components.gyp:variations',
-
-            # Dependencies of visitedlink
-            'components.gyp:visitedlink_browser',
-            'components.gyp:visitedlink_renderer',
-            '../content/content_resources.gyp:content_resources',
-
-            'components.gyp:web_modal',
-            'components.gyp:web_modal_test_support',
           ],
           'conditions': [
-            ['OS == "ios"', {
+            ['OS != "ios"', {

[blundell, 2013/12/03 14:00:23]

I changed to this style because it's in line with how we handle this in other
files. However, if you strongly prefer the style that was there previously I can
revert back to it.

[Jói, 2013/12/03 15:49:59]

This looks fine.

+              'dependencies': [
+                # Dependencies of autofill
+                'components.gyp:autofill_core_browser',
+                'components.gyp:autofill_core_common',
+
+                # Dependencies of browser_context_keyed_service
+                'components.gyp:browser_context_keyed_service',
+
+                # Dependencies of 
+                # intercept_navigation_resource_throttle_unittest.cc
+                '../skia/skia.gyp:skia',
+                'components.gyp:navigation_interception',
+
+                # Dependencies of sessions
+                '../third_party/protobuf/protobuf.gyp:protobuf_lite',
+                'components.gyp:sessions',
+                'components.gyp:sessions_test_support',
+
+                # Dependencies of visitedlink
+                'components.gyp:visitedlink_browser',
+                'components.gyp:visitedlink_renderer',
+                '../content/content_resources.gyp:content_resources',
+
+                # Dependencies of web_modal
+                'components.gyp:web_modal',
+                'components.gyp:web_modal_test_support',
+              ],
+            }, { # 'OS == "ios"'
               'sources/': [
                 ['exclude', '\\.cc$'],
                 ['include', '^test/run_all_unittests\\.cc$'],
                 # TODO(ios): Include files here as they are made to work, see
                 # http://crbug.com/303011.
-                # TODO(asvitkine): Bring up varations/ unittests on iOS.
+                # TODO(asvitkine): Bring up variations/ unittests on iOS.
+                # TODO(blundell): Bring up json_schema/ unittests on iOS.
+                ['include', '^auto_login_parser'],
                 ['include', '^dom_distiller'],
+                ['include', '^precache'],
                 ['include', '^translate'],
               ],
-              'dependencies!': [
-                'autofill_core_common',
-                'navigation_interception',
-                'visitedlink_renderer',
-              ],
             }],
             ['disable_nacl==0', {
               'sources': [