Add support for GCM subtypes to desktop Instance ID implementation

components/gcm_driver.gypi

 # Copyright 2014 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.
 
 {
   'targets': [
     {
       # GN version: //components/gcm_driver/common
       'target_name': 'gcm_driver_common',
       'type': '<(component)',
@@ skipping 13 matching lines @@
     {
       # GN version: //components/gcm_driver
       'target_name': 'gcm_driver',
       'type': 'static_library',
       'dependencies': [
         'gcm_driver_common',
         'gcm_driver_crypto',
         'os_crypt',
         'sync_driver',
         '../base/base.gyp:base',
+        '../components/components.gyp:crx_file',
+        '../components/sync.gyp:sync_proto',
         '../google_apis/gcm/gcm.gyp:gcm',
         '../net/net.gyp:net',
-        '../components/sync.gyp:sync_proto',
         '../url/url.gyp:url_lib',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
          # Note: file list duplicated in GN build.
         'gcm_driver/android/component_jni_registrar.cc',
         'gcm_driver/android/component_jni_registrar.h',
         'gcm_driver/default_gcm_app_handler.cc',
@@ skipping 46 matching lines @@
         'gcm_driver/registration_info.h',
         'gcm_driver/system_encryptor.cc',
         'gcm_driver/system_encryptor.h',
       ],
       'conditions': [
         ['OS == "android"', {
           'dependencies': [
             'gcm_driver_jni_headers',
           ],
           'dependencies!': [
+            '../components/components.gyp:crx_file',
             '../google_apis/gcm/gcm.gyp:gcm',
           ],
           'sources!': [
             'gcm_driver/gcm_account_mapper.cc',
             'gcm_driver/gcm_account_mapper.h',
             'gcm_driver/gcm_channel_status_request.cc',
             'gcm_driver/gcm_channel_status_request.h',
             'gcm_driver/gcm_channel_status_syncer.cc',
             'gcm_driver/gcm_channel_status_syncer.h',
             'gcm_driver/gcm_client_factory.cc',
@@ skipping 250 matching lines @@
           'variables': {
             'jni_gen_package': 'components/gcm_driver/instance_id',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
       ],
      },
     ],
   ],
 }