Make Web Push use InstanceID tokens instead of GCM registrations

chrome/chrome_tests_unit.gypi

 # Copyright 2012 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': {
     'chrome_unit_tests_sources': [
       # histograms.xml is analyzed by AboutFlagsHistogramTest, so this
       # dependency is needed to make commit bots run unit_tests on
       # histograms.xml changes.
       '../tools/metrics/histograms/histograms.xml',
@@ skipping 2286 matching lines @@
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
           ],
           'ldflags': [
             # Some android targets still depend on --gc-sections to link.
             # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
             '-Wl,--gc-sections',
           ],
           '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)' ],
           'sources!': [
             'browser/download/download_request_infobar_delegate_unittest.cc',
           ],
         }],
         ['OS!="android" and OS!="ios"', {
           'dependencies': [
             '../v8/tools/gyp/v8.gyp:v8',
@@ skipping 579 matching lines @@
           ],
           'includes': [ '../build/java.gypi' ],
         },
         {
           'target_name': 'unit_tests_apk',
           'type': 'none',
           'dependencies': [
             'chrome_java',
             'unit_tests_java',
             'unit_tests',
+            '../content/content_shell_and_tests.gyp:content_java_test_support',
           ],
           'variables': {
             'test_suite_name': 'unit_tests',
             'isolate_file': 'unit_tests.isolate',
             'android_manifest_path': 'test/android/unit_tests_apk/AndroidManifest.xml',
             'enable_multidex': 1,
             'conditions': [
               ['v8_use_external_startup_data==1', {
                 'asset_location': '<(PRODUCT_DIR)/unit_tests_apk/assets',
                 'additional_input_paths': [
@@ skipping 81 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }