Make Web Push use InstanceID tokens instead of GCM registrations

content/content_tests.gypi

 # Copyright (c) 2013 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': {
     'layouttest_support_content_sources': [
       'public/test/layouttest_support.h',
-      'public/test/nested_message_pump_android.cc',
-      'public/test/nested_message_pump_android.h',
       'test/layouttest_support.cc',
     ],
     'test_support_content_sources': [
       # TODO(phajdan.jr): All of those files should live in content/test (if
       # they're only used by content) or content/public/test (if they're used
       # by other embedders).
       'browser/download/mock_download_file.cc',
       'browser/download/mock_download_file.h',
       'browser/geolocation/fake_access_token_store.cc',
       'browser/geolocation/fake_access_token_store.h',
@@ skipping 27 matching lines @@
       'public/test/mock_render_process_host.cc',
       'public/test/mock_render_process_host.h',
       'public/test/mock_render_thread.cc',
       'public/test/mock_render_thread.h',
       'public/test/mock_resource_context.cc',
       'public/test/mock_resource_context.h',
       'public/test/mock_special_storage_policy.cc',
       'public/test/mock_special_storage_policy.h',
       'public/test/mock_storage_client.cc',
       'public/test/mock_storage_client.h',
+      'public/test/nested_message_pump_android.cc',
+      'public/test/nested_message_pump_android.h',
       'public/test/ppapi_test_utils.cc',
       'public/test/ppapi_test_utils.h',
       'public/test/render_view_test.cc',
       'public/test/render_view_test.h',
       'public/test/sandbox_file_system_test_helper.cc',
       'public/test/sandbox_file_system_test_helper.h',
       'public/test/test_browser_context.cc',
       'public/test/test_browser_context.h',
       'public/test/test_browser_thread.cc',
       'public/test/test_browser_thread.h',
@@ skipping 917 matching lines @@
           'dependencies': [
             '../ui/compositor/compositor.gyp:compositor',
             '../third_party/libvpx/libvpx.gyp:libvpx',
           ],
         }],
         ['OS=="android"', {
           'dependencies': [
             '../ui/android/ui_android.gyp:ui_android',
             '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
             'content.gyp:content_shell_assets_copy',
+            'test_support_content_jni_headers',
           ],
         }],
         ['v8_use_external_startup_data==1', {
           'dependencies': [
             '../gin/gin.gyp:gin',
           ],
         }],
       ],
     },
     {
       # GN version: //content/test:layouttest_support
       'target_name': 'layouttest_support_content',
       'type': 'static_library',
       'dependencies': [
         'content.gyp:content_renderer',
         'test_support_content',
         '../components/test_runner/test_runner.gyp:test_runner',
         '../skia/skia.gyp:skia',
         '../ui/accessibility/accessibility.gyp:ax_gen',
         '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
         '../v8/tools/gyp/v8.gyp:v8',
       ],
       'include_dirs': [
         '..',
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'sources': [ '<@(layouttest_support_content_sources)' ],
-      'conditions': [
-        ['OS=="android"', {
-          'dependencies': [
-            'test_support_content_jni_headers',
-          ],
-        }],
-      ],
     },
     {
       # GN version: //content/test:content_unittests
       'target_name': 'content_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         'browser/background_sync/background_sync_proto.gyp:background_sync_proto',
         'browser/cache_storage/cache_storage_proto.gyp:cache_storage_proto',
         'browser/notifications/notification_proto.gyp:notification_proto',
         'browser/service_worker/service_worker_proto.gyp:service_worker_proto',
@@ skipping 1177 matching lines @@
                   'content_unittests_apk.isolate',
                 ],
               },
             ],
           },
         ],
       ],
     }],
   ],
 }