Finish decoupling sync and invalidations

components/invalidation.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/invalidation
       'target_name': 'invalidation',
       'type': 'static_library',
@@ skipping 11 matching lines @@
         'signin_core_browser',
       ],
       'export_dependent_settings': [
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
+        'invalidation/ack_handle.cc',
+        'invalidation/ack_handle.h',
+        'invalidation/ack_handler.cc',
+        'invalidation/ack_handler.h',
+        'invalidation/invalidation.cc',
+        'invalidation/invalidation.h',
         'invalidation/invalidation_handler.cc',
         'invalidation/invalidation_handler.h',
         'invalidation/invalidation_logger.cc',
         'invalidation/invalidation_logger.h',
         'invalidation/invalidation_logger_observer.h',
         'invalidation/invalidation_prefs.cc',
         'invalidation/invalidation_prefs.h',
         'invalidation/invalidation_service.h',
         'invalidation/invalidation_service_util.cc',
         'invalidation/invalidation_service_util.h',
         'invalidation/invalidation_state_tracker.cc',
         'invalidation/invalidation_state_tracker.h',
         'invalidation/invalidation_switches.cc',
         'invalidation/invalidation_switches.h',
+        'invalidation/invalidation_util.cc',
+        'invalidation/invalidation_util.h',
         'invalidation/invalidator.cc',
         'invalidation/invalidator.h',
         'invalidation/invalidator_registrar.cc',
         'invalidation/invalidator_registrar.h',
+        'invalidation/invalidator_state.cc',
+        'invalidation/invalidator_state.h',
         'invalidation/invalidator_storage.cc',
         'invalidation/invalidator_storage.h',
         'invalidation/mock_ack_handler.cc',
         'invalidation/mock_ack_handler.h',
         'invalidation/object_id_invalidation_map.cc',
         'invalidation/object_id_invalidation_map.h',
         'invalidation/profile_invalidation_provider.cc',
         'invalidation/profile_invalidation_provider.h',
         'invalidation/single_object_invalidation_set.cc',
         'invalidation/single_object_invalidation_set.h',
@@ skipping 57 matching lines @@
       'sources': [
         # Note: sources list duplicated in GN build.
         'invalidation/fake_invalidation_handler.cc',
         'invalidation/fake_invalidation_handler.h',
         'invalidation/fake_invalidation_state_tracker.cc',
         '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/invalidation_test_util.cc',
+        'invalidation/invalidation_test_util.h',
         'invalidation/invalidator_test_template.cc',
         'invalidation/invalidator_test_template.h',
         'invalidation/object_id_invalidation_map_test_util.cc',
         'invalidation/object_id_invalidation_map_test_util.h',
         'invalidation/unacked_invalidation_set_test_util.cc',
         'invalidation/unacked_invalidation_set_test_util.h',
       ],
       'conditions': [
           ['OS != "android"', {
             'sources': [
               # Note: sources list duplicated in GN build.
               'invalidation/p2p_invalidation_service.cc',
               'invalidation/p2p_invalidation_service.h',
             ],
           }],
       ],
     },
   ],
 }