Make Web Push use InstanceID tokens instead of GCM registrations

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index c385b234159ffdb00f29813961ed8c587b32c225..080376ad5569e99a6f89a0df08af2bfbc4042f58 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -6,8 +6,6 @@
   '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': [
@@ -55,6 +53,8 @@
       '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',
@@ -992,6 +992,7 @@
             '../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', {
@@ -1019,13 +1020,6 @@
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'sources': [ '<@(layouttest_support_content_sources)' ],
-      'conditions': [
-        ['OS=="android"', {
-          'dependencies': [
-            'test_support_content_jni_headers',
-          ],
-        }],
-      ],
     },
     {
       # GN version: //content/test:content_unittests