Componentize TiclInvalidationService

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 90b94b5265d951f154a232689dc359f77df479ff..a1b218e1183b56f42b37eaf60d6527bb97fa141f 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -925,16 +925,12 @@
         'browser/internal_auth.h',
         'browser/intranet_redirect_detector.cc',
         'browser/intranet_redirect_detector.h',
-        'browser/invalidation/gcm_invalidation_bridge.cc',
-        'browser/invalidation/gcm_invalidation_bridge.h',
         'browser/invalidation/invalidation_controller_android.cc',
         'browser/invalidation/invalidation_controller_android.h',
         'browser/invalidation/invalidation_service_android.cc',
         'browser/invalidation/invalidation_service_android.h',
         'browser/invalidation/profile_invalidation_provider_factory.cc',
         'browser/invalidation/profile_invalidation_provider_factory.h',
-        'browser/invalidation/ticl_invalidation_service.cc',
-        'browser/invalidation/ticl_invalidation_service.h',
         'browser/invalidation/ticl_profile_settings_provider.cc',
         'browser/invalidation/ticl_profile_settings_provider.h',
         'browser/io_thread.cc',
@@ -3308,14 +3304,8 @@
             'test/base/test_switches.cc',
 
             # Android uses a different invalidation service
-            'browser/invalidation/gcm_invalidation_bridge.cc',
-            'browser/invalidation/gcm_invalidation_bridge.h',
-            'browser/invalidation/ticl_invalidation_service.cc',
-            'browser/invalidation/ticl_invalidation_service.h',
             'browser/invalidation/ticl_profile_settings_provider.cc',
             'browser/invalidation/ticl_profile_settings_provider.h',
-            'invalidation/ticl_settings_provider.cc',
-            'invalidation/ticl_settings_provider.h',
 
             'browser/sync/glue/synced_tab_delegate.cc',
           ],