Merge 208347 "Revert 208315 "Make use of InvalidationService""

sync/sync_notifier.gypi

 # Copyright 2013 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.
 
 {
   'include_dirs': [
     '..',
   ],
   'defines': [
     'SYNC_IMPLEMENTATION',
@@ skipping 10 matching lines @@
   'export_dependent_settings': [
     '../jingle/jingle.gyp:notifier',
     '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
   ],
   'sources': [
     'notifier/invalidation_handler.h',
     'notifier/invalidation_state_tracker.cc',
     'notifier/invalidation_state_tracker.h',
     'notifier/invalidation_util.cc',
     'notifier/invalidation_util.h',
+    'notifier/invalidator_factory.cc',
+    'notifier/invalidator_factory.h',
     'notifier/invalidator.h',
     'notifier/invalidator_registrar.cc',
     'notifier/invalidator_registrar.h',
     'notifier/invalidator_state.cc',
     'notifier/invalidator_state.h',
     'notifier/object_id_invalidation_map.cc',
     'notifier/object_id_invalidation_map.h',
   ],
   'conditions': [
     ['OS != "android"', {
@@ skipping 12 matching lines @@
         'notifier/registration_manager.h',
         'notifier/state_writer.h',
         'notifier/sync_invalidation_listener.cc',
         'notifier/sync_invalidation_listener.h',
         'notifier/sync_system_resources.cc',
         'notifier/sync_system_resources.h',
       ],
     }],
   ],
 }