Move all remaining files to gcm_driver component

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': [
     {
       'target_name': 'gcm_driver',
       'type': 'static_library',
       'dependencies': [
+        'os_crypt',

[blundell, 2014/05/26 07:31:56]

It looks like there should be a google_apis dependency here?

[jianli, 2014/05/27 17:27:55]

I've already added the dependency to ../google_apis/gcm/gcm.gyp:gcm at line 14.

         '../base/base.gyp:base',
         '../google_apis/gcm/gcm.gyp:gcm',
-        'os_crypt',
+        '../net/net.gyp:net',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         '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',
         'gcm_driver/gcm_app_handler.h',
         'gcm_driver/gcm_client_factory.cc',
         'gcm_driver/gcm_client_factory.h',
+        'gcm_driver/gcm_driver.cc',
+        'gcm_driver/gcm_driver.h',
         'gcm_driver/gcm_driver_android.cc',
         'gcm_driver/gcm_driver_android.h',
         'gcm_driver/system_encryptor.cc',
         'gcm_driver/system_encryptor.h',
       ],
       'conditions': [
         ['OS == "android"', {
           'dependencies': [
             'gcm_driver_jni_headers',
           ],
         }],
       ],
     },
+    {
+      'target_name': 'gcm_driver_test_support',
+      'type': 'static_library',
+      'dependencies': [
+        'gcm_driver',
+        '../base/base.gyp:base',
+        '../testing/gtest.gyp:gtest',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'gcm_driver/fake_gcm_app_handler.cc',
+        'gcm_driver/fake_gcm_app_handler.h',
+        'gcm_driver/fake_gcm_client.cc',
+        'gcm_driver/fake_gcm_client.h',
+        'gcm_driver/fake_gcm_client_factory.cc',
+        'gcm_driver/fake_gcm_client_factory.h',
+      ],
+    },    
   ],
   'conditions': [
     ['OS == "android"', {
       'targets': [
         {
           'target_name': 'gcm_driver_java',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base',
           ],
@@ skipping 11 matching lines @@
           'variables': {
             'jni_gen_package': 'components/gcm_driver',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
       ],
      },
     ],
   ],
 }