Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver

sync/sync.gyp

Index: sync/sync.gyp
diff --git a/sync/sync.gyp b/sync/sync.gyp
index 507f73c0a62e86518c610e97d077227824f994e0..999e52b2253dede3d8042869af16d3ba528f8719 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -25,12 +25,15 @@
         '../crypto/crypto.gyp:crypto',
         '../net/net.gyp:net',
         '../sql/sql.gyp:sql',
+        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
         'protocol/sync_proto.gyp:sync_proto',
       ],
       'export_dependent_settings': [
         # Propagate sync_proto since our headers include its generated
         # files.
         'protocol/sync_proto.gyp:sync_proto',
+        # Temporary hack to propagate dependencies on this.
+        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',

[dcheng, 2012/07/10 19:15:25]

This is because model_type_payload_map.h defines the conversions between
ObjectIdPayloadMap and ModelTypePayloadMap, which requires us to pull in
google/cacheinvalidation/include/types.h in the header.

Note that we don't /have/ to put the cacheinvalidation include in
model_type_payload_map.h; however, this leads to adding a lot of random includes
in a bunch of .cc files and having to fix DEPS outside of sync as well..

[akalin, 2012/07/11 00:10:24]

I think the best solution would be to put the conversion function in
object_id_payload_map instead, since sync_notifier already depends on
cacheinvalidation (and it should be the only one that does).

[dcheng, 2012/07/11 05:45:28]

Done. I think it makes more sense the other way though, since the sync stuff is
built on the invalidation stuff; maybe a long-term cleanup?

       ],
       'sources': [
         'internal_api/public/base/enum_set.h',
@@ -237,11 +240,12 @@
       'sources': [
         'notifier/invalidation_util.cc',
         'notifier/invalidation_util.h',
-        'notifier/notifications_disabled_reason.h',
         'notifier/notifications_disabled_reason.cc',
-        'notifier/sync_notifier.h',
-        'notifier/sync_notifier_factory.h',
+        'notifier/notifications_disabled_reason.h',
+        'notifier/object_id_payload_map.h',
         'notifier/sync_notifier_factory.cc',
+        'notifier/sync_notifier_factory.h',
+        'notifier/sync_notifier.h',
         'notifier/sync_notifier_observer.h',
       ],
       'conditions': [
@@ -251,13 +255,15 @@
             'notifier/chrome_invalidation_client.h',
             'notifier/chrome_system_resources.cc',
             'notifier/chrome_system_resources.h',
-            'notifier/invalidation_notifier.h',
+            'notifier/invalidation_notifier_base.cc',
+            'notifier/invalidation_notifier_base.h',
             'notifier/invalidation_notifier.cc',
+            'notifier/invalidation_notifier.h',
             'notifier/invalidation_state_tracker.h',
-            'notifier/non_blocking_invalidation_notifier.h',
             'notifier/non_blocking_invalidation_notifier.cc',
-            'notifier/p2p_notifier.h',
+            'notifier/non_blocking_invalidation_notifier.h',
             'notifier/p2p_notifier.cc',
+            'notifier/p2p_notifier.h',
             'notifier/push_client_channel.cc',
             'notifier/push_client_channel.h',
             'notifier/registration_manager.cc',