Hook up the Push API with GCM's new ability to own encryption keys.

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)',
       'include_dirs': [
         '..',
       ],
       'defines': [
         'GCM_DRIVER_IMPLEMENTATION',
       ],
       'sources': [
          # Note: file list duplicated in GN build.
         'gcm_driver/common/gcm_driver_export.h',
         'gcm_driver/common/gcm_messages.cc',
         'gcm_driver/common/gcm_messages.h',
       ],
     },
     {
       # GN version: //components/gcm_driver
       'target_name': 'gcm_driver',
       'type': 'static_library',
       'dependencies': [
+        'gcm_driver_common',
+        'gcm_driver_crypto',
         'os_crypt',
         '../base/base.gyp:base',
         '../google_apis/gcm/gcm.gyp:gcm',
         '../net/net.gyp:net',
         '../sync/sync.gyp:sync_proto',
-        'gcm_driver_common',
       ],
       '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',
         'gcm_driver/default_gcm_app_handler.h',
@@ skipping 155 matching lines @@
         'gcm_driver_crypto_proto',
         '../base/base.gyp:base',
         '../components/components.gyp:leveldb_proto',
         '../crypto/crypto.gyp:crypto',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         # Note: file list duplicated in GN build.
+        'gcm_driver/crypto/gcm_encryption_provider.cc',
+        'gcm_driver/crypto/gcm_encryption_provider.h',
         'gcm_driver/crypto/gcm_key_store.cc',
         'gcm_driver/crypto/gcm_key_store.h',
         'gcm_driver/crypto/gcm_message_cryptographer.cc',
         'gcm_driver/crypto/gcm_message_cryptographer.h',
         'gcm_driver/crypto/gcm_message_cryptographer_nss.cc',
         'gcm_driver/crypto/gcm_message_cryptographer_openssl.cc',
       ],
       'conditions': [
         ['use_openssl==1', {
           'sources!': [
@@ skipping 51 matching lines @@
           'variables': {
             'jni_gen_package': 'components/gcm_driver',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
       ],
      },
     ],
   ],
 }