Build components and run components_tests on iOS

Build components and run components_tests on iOS

This CL also adds a missing iOS string that was preventing dom_distiller from compiling on iOS.

BUG=NONE

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=226799

[blundell, 2013-10-02 11:45:02]

LGTM

Can you make a follow-up bug for running component_unittests on the iOS bots?
You can assign it to me for now, and I'll follow up on it.

https://codereview.chromium.org/25706003/diff/3001/components/components_test...
File components/components_tests.gypi (right):

https://codereview.chromium.org/25706003/diff/3001/components/components_test...
components/components_tests.gypi:23: # TODO(asvitkine): These should be tested
on iOS too.
Move this comment down to where you're excluding all the CC files and change it
to be something like

TODO(asvitkine): Bring up varations/ unittests on iOS.

[droger, 2013-10-02 11:55:08]

+joi as OWNER of components

[blundell, 2013-10-02 11:57:03]

Sorry, I meant something different re: the bug: a bug for running the
components_unittests target on the iOS bots. The bringup of individual tests on
iOS will happen naturally as we perform layered componentizations.

[droger, 2013-10-02 12:01:57]

On 2013/10/02 11:57:03, blundell wrote:
> Sorry, I meant something different re: the bug: a bug for running the
> components_unittests target on the iOS bots. The bringup of individual tests
on
> iOS will happen naturally as we perform layered componentizations.

Sorry for the confusion.
I filed: https://code.google.com/p/chromium/issues/detail?id=303018

[Jói, 2013-10-02 12:14:38]

LGTM, just one question: I recall from a conversation a few weeks ago that
dom_distiller is supposed to end up working on iOS as well. Perhaps someone from
that team should review as well?

[droger, 2013-10-02 12:19:30]

+bengr for the dom_distiller part

[Yaron, 2013-10-03 09:11:45]

Yes, dom_distiller should work on ios. Were you hitting compile errors?

https://codereview.chromium.org/25706003/diff/12001/components/components.gyp
File components/components.gyp (right):

https://codereview.chromium.org/25706003/diff/12001/components/components.gyp...
components/components.gyp:33: 'dom_distiller.gypi',
Why exclude it?

[droger, 2013-10-03 09:28:23]

I tried to compile again, and the compilation error is indeed minor: adding the
IDS_DOM_DISTILLER_TITLE constant do ios/build/grit_whitelist.txt fixes it.
I'll fix it as a part of this CL.

[droger, 2013-10-03 09:40:38]

I fixed dom_distiller compilation error, and added it back, as well as the
unittests.

[Yaron, 2013-10-03 09:42:35]

lgtm

https://codereview.chromium.org/25706003/diff/23001/components/components_tes...
File components/components_tests.gypi (right):

https://codereview.chromium.org/25706003/diff/23001/components/components_tes...
components/components_tests.gypi:90: ['include',
'^dom_distiller/core/dom_distiller_database_unittest\\.cc$'],
Looks like you'll have some more work here but fine for now

[droger, 2013-10-03 09:56:15]

It seems that the leveldatabase third_party is also missing.
It compiled on my machine, but fails on the bots. I am updating DEPS...

[commit-bot: I haz the power, 2013-10-03 10:46:06]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/droger@chromium.org/25706003/32001

[commit-bot: I haz the power, 2013-10-03 15:34:24]

Failed to apply patch for components/components_tests.gypi:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file components/components_tests.gypi
  Hunk #1 FAILED at 3.
  1 out of 1 hunk FAILED -- saving rejects to file
components/components_tests.gypi.rej

Patch:       components/components_tests.gypi
Index: components/components_tests.gypi
diff --git a/components/components_tests.gypi b/components/components_tests.gypi
index
94b87007517ef409eeabcb90957640d353a3fc66..24d527333f758b261f1bdefb98448118e2127bd3
100644
--- a/components/components_tests.gypi
+++ b/components/components_tests.gypi
@@ -3,126 +3,142 @@
 # found in the LICENSE file.
 
 {
-  'conditions': [
-    ['OS != "ios"', {
-      'targets': [
-        {
-          'target_name': 'components_unittests',
-          'type': '<(gtest_target_type)',
-          'sources': [
-            'autofill/core/common/form_data_unittest.cc',
-            'autofill/core/common/form_field_data_unittest.cc',
-            'auto_login_parser/auto_login_parser_unittest.cc',
-           
'browser_context_keyed_service/browser_context_dependency_manager_unittest.cc',
-            'browser_context_keyed_service/dependency_graph_unittest.cc',
-            'dom_distiller/core/dom_distiller_database_unittest.cc',
-            'json_schema/json_schema_validator_unittest.cc',
-            'json_schema/json_schema_validator_unittest_base.cc',
-            'json_schema/json_schema_validator_unittest_base.h',
-           
'navigation_interception/intercept_navigation_resource_throttle_unittest.cc',
-            'sessions/serialized_navigation_entry_unittest.cc',
-            'test/run_all_unittests.cc',
-            # TODO(asvitkine): These should be tested on iOS too.
-            'variations/entropy_provider_unittest.cc',
-            'variations/metrics_util_unittest.cc',
-            'variations/variations_associated_data_unittest.cc',
-            'variations/variations_seed_processor_unittest.cc',
-            'visitedlink/test/visitedlink_unittest.cc',
-            'webdata/encryptor/encryptor_password_mac_unittest.cc',
-            'webdata/encryptor/encryptor_unittest.cc',
-            'web_modal/web_contents_modal_dialog_manager_unittest.cc',
-          ],
-          'include_dirs': [
-            '..',
-          ],
-          'dependencies': [
-            '../base/base.gyp:test_support_base',
-            '../testing/gmock.gyp:gmock',
-            '../testing/gtest.gyp:gtest',
+  'targets': [
+    {
+      'target_name': 'components_unittests',
+      'type': '<(gtest_target_type)',
+      'sources': [
+        'autofill/core/common/form_data_unittest.cc',
+        'autofill/core/common/form_field_data_unittest.cc',
+        'auto_login_parser/auto_login_parser_unittest.cc',
+       
'browser_context_keyed_service/browser_context_dependency_manager_unittest.cc',
+        'browser_context_keyed_service/dependency_graph_unittest.cc',
+        'dom_distiller/core/dom_distiller_database_unittest.cc',
+        'json_schema/json_schema_validator_unittest.cc',
+        'json_schema/json_schema_validator_unittest_base.cc',
+        'json_schema/json_schema_validator_unittest_base.h',
+       
'navigation_interception/intercept_navigation_resource_throttle_unittest.cc',
+        'sessions/serialized_navigation_entry_unittest.cc',
+        'test/run_all_unittests.cc',
+        'variations/entropy_provider_unittest.cc',
+        'variations/metrics_util_unittest.cc',
+        'variations/variations_associated_data_unittest.cc',
+        'variations/variations_seed_processor_unittest.cc',
+        'visitedlink/test/visitedlink_unittest.cc',
+        'webdata/encryptor/encryptor_password_mac_unittest.cc',
+        'webdata/encryptor/encryptor_unittest.cc',
+        'web_modal/web_contents_modal_dialog_manager_unittest.cc',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'dependencies': [
+        '../base/base.gyp:test_support_base',
+        '../testing/gmock.gyp:gmock',
+        '../testing/gtest.gyp:gtest',
 
-            # Dependencies of autofill
-            'autofill_core_common',
+        # Dependencies of autofill
+        'autofill_core_common',
 
-            # Dependencies of auto_login_parser
-            'auto_login_parser',
+        # Dependencies of auto_login_parser
+        'auto_login_parser',
 
-            # Dependencies of browser_context_keyed_service
-            'browser_context_keyed_service',
+        # Dependencies of browser_context_keyed_service
+        'browser_context_keyed_service',
 
-            # Dependencies of dom_distiller
-            'dom_distiller_core',
-            'dom_distiller_core_proto',
+        # Dependencies of dom_distiller
+        'dom_distiller_core',
+        'dom_distiller_core_proto',
 
-            # Dependencies of encryptor
-            'encryptor',
+        # Dependencies of encryptor
+        'encryptor',
 
-            # Dependencies of json_schema
-            'json_schema',
+        # Dependencies of json_schema
+        'json_schema',
 
-            # Dependencies of
intercept_navigation_resource_throttle_unittest.cc
-            '../content/content.gyp:test_support_content',
-            '../skia/skia.gyp:skia',
-            'navigation_interception',
+        # Dependencies of intercept_navigation_resource_throttle_unittest.cc
+        '../content/content.gyp:test_support_content',
+        '../skia/skia.gyp:skia',
+        'navigation_interception',
 
-            # Dependencies of policy
-            'policy_component',
+        # Dependencies of policy
+        'policy_component',
 
-            # Dependencies of sessions
-            '../third_party/protobuf/protobuf.gyp:protobuf_lite',
-            'sessions',
-            'sessions_test_support',
+        # Dependencies of sessions
+        '../third_party/protobuf/protobuf.gyp:protobuf_lite',
+        'sessions',
+        'sessions_test_support',
 
-            # Dependencies of variations
-            'variations',
+        # Dependencies of variations
+        'variations',
 
-            # Dependencies of visitedlink
-            'visitedlink_browser',
-            'visitedlink_renderer',
-            '../content/content_resources.gyp:content_resources',
+        # Dependencies of visitedlink
+        'visitedlink_browser',
+        'visitedlink_renderer',
+        '../content/content_resources.gyp:content_resources',
 
+        'web_modal',
+      ],
+      'conditions': [
+        ['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.
+            ['include', '^dom_distiller'],
+          ],
+          'dependencies!': [
+            'autofill_core_common',
+            'navigation_interception',
+            'visitedlink_renderer',
+          ],
+        }],
+        ['OS == "android"', {
+          'sources!': [
+            'web_modal/web_contents_modal_dialog_manager_unittest.cc',
+          ],
+          'dependencies!': [
             'web_modal',
           ],
-          'conditions': [
-            ['OS == "android"', {
-              'sources!': [
-                'web_modal/web_contents_modal_dialog_manager_unittest.cc',
-              ],
-              'dependencies!': [
-                'web_modal',
-              ],
-            }],
-            ['OS == "android" and gtest_target_type == "shared_library"', {
-              'dependencies': [
-                '../testing/android/native_test.gyp:native_test_native_code',
-              ]
-            }],
-            ['OS=="win" and win_use_allocator_shim==1', {
-              'dependencies': [
-                '../base/allocator/allocator.gyp:allocator',
-              ],
-            }],
-            ['android_webview_build == 0', {
-              'dependencies': [
-                '../sync/sync.gyp:sync',
-              ],
-            }],
-            ['OS=="linux" and component=="shared_library" and
linux_use_tcmalloc==1', {
-            'dependencies': [
-                '<(DEPTH)/base/allocator/allocator.gyp:allocator',
-            ],
-            'link_settings': {
-                'ldflags': ['-rdynamic'],
-            },
-            }],
-            ['configuration_policy==1', {
-              'sources': [
-                'policy/core/common/schema_unittest.cc',
-              ],
-            }],
+        }],
+        ['OS == "android" and gtest_target_type == "shared_library"', {
+          'dependencies': [
+            '../testing/android/native_test.gyp:native_test_native_code',
+          ]
+        }],
+        ['OS=="win" and win_use_allocator_shim==1', {
+          'dependencies': [
+            '../base/allocator/allocator.gyp:allocator',
           ],
-          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [4267, ],
+        }],
+        ['android_webview_build == 0', {
+          'dependencies': [
+            '../sync/sync.gyp:sync',
+          ],
+        }],
+        ['OS=="linux" and component=="shared_library" and
linux_use_tcmalloc==1', {
+        'dependencies': [
+            '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+        ],
+        'link_settings': {
+            'ldflags': ['-rdynamic'],
         },
+        }],
+        ['configuration_policy==1', {
+          'sources': [
+            'policy/core/common/schema_unittest.cc',
+          ],
+        }],
+      ],
+      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+      'msvs_disabled_warnings': [4267, ],
+    },
+  ],
+  'conditions': [
+    ['OS != "ios"', {
+      'targets': [
         {
           'target_name': 'components_perftests',
           'type': '<(gtest_target_type)',

[commit-bot: I haz the power, 2013-10-03 15:53:42]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/droger@chromium.org/25706003/51001

[commit-bot: I haz the power, 2013-10-03 16:13:31]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/droger@chromium.org/25706003/35001

[commit-bot: I haz the power, 2013-10-03 18:24:59]

Change committed as 226799