Make Web Push use InstanceID tokens instead of GCM registrations

chrome/chrome_tests_unit.gypi

Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 338a120d50179b8f805d164e02d1bc7cb07d1cdb..1c6a7f140bb4e51ad8e232e4c19b21b8c299e50e 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2304,6 +2304,7 @@
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
             '../components/components.gyp:offline_pages',
+            '../content/content_shell_and_tests.gyp:layouttest_support_content',
           ],
         }, {  # Not Android.
           'sources': [ '<@(chrome_unit_tests_non_android_sources)' ],
@@ -2903,6 +2904,7 @@
             'chrome_java',
             'unit_tests_java',
             'unit_tests',
+            '../content/content_shell_and_tests.gyp:content_java_test_support',
           ],
           'variables': {
             'test_suite_name': 'unit_tests',