Move GCMClient related files to gcm_driver component

components/gcm_driver.gypi

Index: components/gcm_driver.gypi
diff --git a/components/gcm_driver.gypi b/components/gcm_driver.gypi
index 7b3bb4a2ab00b5e86024f66bdd1bf70e6710be55..f99d5d9bb001e9c3bab42ac5709a2cdf7f615603 100644
--- a/components/gcm_driver.gypi
+++ b/components/gcm_driver.gypi
@@ -21,15 +21,23 @@
         'gcm_driver/android/component_jni_registrar.h',
         'gcm_driver/default_gcm_app_handler.cc',
         'gcm_driver/default_gcm_app_handler.h',
+        'gcm_driver/gcm_activity.cc',
+        'gcm_driver/gcm_activity.h',
         'gcm_driver/gcm_app_handler.h',
+        'gcm_driver/gcm_client.cc',
+        'gcm_driver/gcm_client.h',
         'gcm_driver/gcm_client_factory.cc',
         'gcm_driver/gcm_client_factory.h',
+        'gcm_driver/gcm_client_impl.cc',
+        'gcm_driver/gcm_client_impl.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/gcm_driver_desktop.cc',
         'gcm_driver/gcm_driver_desktop.h',
+        'gcm_driver/gcm_stats_recorder_impl.cc',
+        'gcm_driver/gcm_stats_recorder_impl.h',
         'gcm_driver/system_encryptor.cc',
         'gcm_driver/system_encryptor.h',
       ],
@@ -38,9 +46,18 @@
           'dependencies': [
             'gcm_driver_jni_headers',
           ],
+          'dependencies!': [
+            '../google_apis/gcm/gcm.gyp:gcm',
+          ],
           'sources!': [
+            'gcm_driver/gcm_client_factory.cc',
+            'gcm_driver/gcm_client_factory.h',
+            'gcm_driver/gcm_client_impl.cc',
+            'gcm_driver/gcm_client_impl.h',
             'gcm_driver/gcm_driver_desktop.cc',
             'gcm_driver/gcm_driver_desktop.h',
+            'gcm_driver/gcm_stats_recorder_impl.cc',
+            'gcm_driver/gcm_stats_recorder_impl.h',
           ],
         }],
       ],
@@ -51,6 +68,7 @@
       'dependencies': [
         'gcm_driver',
         '../base/base.gyp:base',
+        '../google_apis/gcm/gcm.gyp:gcm_test_support',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
@@ -66,6 +84,19 @@
         'gcm_driver/fake_gcm_driver.cc',
         'gcm_driver/fake_gcm_driver.h',
       ],
+      'conditions': [
+        ['OS == "android"', {
+          'dependencies!': [
+            '../google_apis/gcm/gcm.gyp:gcm_test_support',
+          ],
+          'sources!': [
+            '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': [