Rename SyncNotifier->Invalidator and SyncNotifierObserver->InvalidationHandler.

sync/sync.gyp

Index: sync/sync.gyp
diff --git a/sync/sync.gyp b/sync/sync.gyp
index 397d057a089e6e1149851c0bbe06192e64b0fe46..191cfd0985c71345f4d557724619bf3bfed58e2b 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -253,18 +253,18 @@
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
       ],
       'sources': [
+        'notifier/invalidation_handler.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/notifications_disabled_reason.cc',
         'notifier/notifications_disabled_reason.h',
         'notifier/object_id_state_map.cc',
         'notifier/object_id_state_map.h',
-        'notifier/sync_notifier.h',
-        'notifier/sync_notifier_factory.cc',
-        'notifier/sync_notifier_factory.h',
-        'notifier/sync_notifier_observer.h',
-        'notifier/sync_notifier_registrar.cc',
-        'notifier/sync_notifier_registrar.h',
       ],
       'conditions': [
         ['OS != "android"', {
@@ -480,10 +480,10 @@
       'sources': [
         'notifier/fake_invalidation_state_tracker.cc',
         'notifier/fake_invalidation_state_tracker.h',
-        'notifier/fake_sync_notifier.cc',
-        'notifier/fake_sync_notifier.h',
-        'notifier/fake_sync_notifier_observer.cc',
-        'notifier/fake_sync_notifier_observer.h',
+        'notifier/fake_invalidator.cc',
+        'notifier/fake_invalidator.h',
+        'notifier/fake_invalidation_handler.cc',
+        'notifier/fake_invalidation_handler.h',
         'notifier/object_id_state_map_test_util.cc',
         'notifier/object_id_state_map_test_util.h',
       ],
@@ -664,7 +664,7 @@
           '..',
         ],
         'sources': [
-          'notifier/sync_notifier_factory_unittest.cc',
+          'notifier/invalidator_factory_unittest.cc',
         ],
         'conditions': [
           ['OS != "android"', {
@@ -672,11 +672,11 @@
               'notifier/chrome_invalidation_client_unittest.cc',
               'notifier/chrome_system_resources_unittest.cc',
               'notifier/invalidation_notifier_unittest.cc',
+              'notifier/invalidator_registrar_unittest.cc',
               'notifier/non_blocking_invalidation_notifier_unittest.cc',
               'notifier/p2p_notifier_unittest.cc',
               'notifier/push_client_channel_unittest.cc',
               'notifier/registration_manager_unittest.cc',
-              'notifier/sync_notifier_registrar_unittest.cc',
             ],
           }],
         ],