Componentize TiclInvalidationService

components/invalidation.gypi

Index: components/invalidation.gypi
diff --git a/components/invalidation.gypi b/components/invalidation.gypi
index fc39383c7a89aafc65ce251fb201c2d1352074fb..fd4b70ea33abcf35e9fa5fa32cfb0ad5ff42d774 100644
--- a/components/invalidation.gypi
+++ b/components/invalidation.gypi
@@ -13,8 +13,10 @@
         '../jingle/jingle.gyp:notifier',
         '../sync/sync.gyp:sync',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+        'gcm_driver',
         'keyed_service_core',
         'pref_registry',
+        'signin_core_browser',
       ],
       'include_dirs': [
         '..',
@@ -34,12 +36,12 @@
         'invalidation/invalidator_registrar.h',
         'invalidation/invalidator_storage.cc',
         'invalidation/invalidator_storage.h',
-        'invalidation/ticl_settings_provider.cc',
-        'invalidation/ticl_settings_provider.h',
       ],
       'conditions': [
           ['OS != "android"', {
             'sources': [
+              'invalidation/gcm_invalidation_bridge.cc',
+              'invalidation/gcm_invalidation_bridge.h',
               'invalidation/gcm_network_channel.cc',
               'invalidation/gcm_network_channel.h',
               'invalidation/gcm_network_channel_delegate.h',
@@ -58,6 +60,10 @@
               'invalidation/sync_invalidation_listener.h',
               'invalidation/sync_system_resources.cc',
               'invalidation/sync_system_resources.h',
+              'invalidation/ticl_invalidation_service.cc',
+              'invalidation/ticl_invalidation_service.h',
+              'invalidation/ticl_settings_provider.cc',
+              'invalidation/ticl_settings_provider.h',
             ],
           }],
       ],
@@ -76,6 +82,7 @@
         '../sync/sync.gyp:test_support_sync_notifier',
         '../testing/gmock.gyp:gmock',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+        'gcm_driver_test_support',
         'keyed_service_core',
       ],
       'include_dirs': [
@@ -88,6 +95,8 @@
         'invalidation/fake_invalidation_state_tracker.h',
         'invalidation/fake_invalidator.cc',
         'invalidation/fake_invalidator.h',
+        'invalidation/invalidation_service_test_template.cc',
+        'invalidation/invalidation_service_test_template.h',
         'invalidation/invalidator_test_template.cc',
         'invalidation/invalidator_test_template.h',
       ],