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

components/components_tests.gyp

Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 240c379b72d10baa4ed983187789e0a75d54fece..e0e91ba887a032bf386d449fcb901cb5c280cf7e 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -1401,7 +1401,6 @@
             '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',
@@ -1409,11 +1408,14 @@
             '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',
@@ -1667,7 +1669,11 @@
           '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',