Add fake for InstanceIDWithSubtype.java, in order to re-use unit test

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 1383 matching lines @@
             'data_usage/android/traffic_stats_amortizer_unittest.cc',
             'invalidation/impl/invalidation_logger_unittest.cc',
             'invalidation/impl/invalidation_service_android_unittest.cc',
           ],
           'sources!': [
             'gcm_driver/gcm_account_mapper_unittest.cc',
             'gcm_driver/gcm_channel_status_request_unittest.cc',
             'gcm_driver/gcm_client_impl_unittest.cc',
             'gcm_driver/gcm_driver_desktop_unittest.cc',
             'gcm_driver/gcm_stats_recorder_impl_unittest.cc',
-            'gcm_driver/instance_id/instance_id_driver_unittest.cc',
             'sessions/core/session_backend_unittest.cc',
             'storage_monitor/media_storage_util_unittest.cc',
             'storage_monitor/storage_info_unittest.cc',
             'storage_monitor/storage_monitor_unittest.cc',
             'web_modal/web_contents_modal_dialog_manager_unittest.cc',
           ],
           'dependencies': [
+            # Required by instance_id_unittest_sources for
+            # NestedMessagePumpAndroid (and NestedSystemMessageHandler).
+            '../content/content_shell_and_tests.gyp:layouttest_support_content',

[Peter Beverloo, 2016/04/11 14:57:05]

I am not comfortable with adding this dependency, sorry.

The `layouttest_support_content` target depends on the test runner in
//components/test_runner/, which means that you're adding an indirect dependency
from any unit test part of //components to the test runner.

[johnme, 2016/04/14 18:32:41]

Removed.

+            '../content/content.gyp:content_java',
+            '../testing/android/native_test.gyp:native_test_native_code',
             'components.gyp:data_usage_android',
             'components.gyp:safe_json_java',
             'components.gyp:variations_java',
-            '../content/content.gyp:content_java',
-            '../testing/android/native_test.gyp:native_test_native_code',
           ],
           'dependencies!': [
             'components.gyp:storage_monitor',
             'components.gyp:storage_monitor_test_support',
             'components.gyp:web_modal',
             'components.gyp:web_modal_test_support',
           ],
         }, {
           'sources': [
             '<@(invalidation_unittest_sources)',
@@ skipping 233 matching lines @@
               }],
             ],
           },
           'includes': [ '../build/apk_browsertest.gypi' ],
         },
         {
           'target_name': 'components_unittests_apk',
           'isolate_file': 'components_unittests.isolate',
           'type': 'none',
           'dependencies': [
+            # Required by instance_id_unittest_sources for
+            # NestedSystemMessageHandler.java
+            '../content/content_shell_and_tests.gyp:content_java_test_support',
             'components_unittests',
+            'components.gyp:instance_id_driver_java',
             'components.gyp:invalidation_java',
             'components.gyp:signin_core_browser_java',
             'components.gyp:web_restrictions_test_support_java',
           ],
           'variables': {
             'test_suite_name': 'components_unittests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
         {
@@ skipping 243 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }