Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver

sync/sync.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     # The core sync library.
     #
     # TODO(akalin): Rename this to something like 'sync_core' and
     # reserve the 'sync' name for the overarching library that clients
     # should depend on.
     {
       'target_name': 'sync',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'include_dirs': [
         '..',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../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',
         'internal_api/public/base/model_type.h',
         'internal_api/public/base/model_type_payload_map.cc',
         'internal_api/public/base/model_type_payload_map.h',
         'internal_api/public/engine/model_safe_worker.cc',
         'internal_api/public/engine/model_safe_worker.h',
         'internal_api/public/engine/passive_model_worker.cc',
         'internal_api/public/engine/passive_model_worker.h',
@@ skipping 186 matching lines @@
         '../third_party/libjingle/libjingle.gyp:libjingle',
         'sync',
       ],
       'export_dependent_settings': [
         '../jingle/jingle.gyp:notifier',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
       ],
       'sources': [
         'notifier/invalidation_util.cc',
         'notifier/invalidation_util.h',
+        'notifier/notifications_disabled_reason.cc',
         'notifier/notifications_disabled_reason.h',
-        'notifier/notifications_disabled_reason.cc',
+        'notifier/object_id_payload_map.h',
+        'notifier/sync_notifier_factory.cc',
+        'notifier/sync_notifier_factory.h',
         'notifier/sync_notifier.h',
-        'notifier/sync_notifier_factory.h',
-        'notifier/sync_notifier_factory.cc',
         'notifier/sync_notifier_observer.h',
       ],
       'conditions': [
         ['OS != "android"', {
           'sources': [
             'notifier/chrome_invalidation_client.cc',
             'notifier/chrome_invalidation_client.h',
             'notifier/chrome_system_resources.cc',
             'notifier/chrome_system_resources.h',
+            'notifier/invalidation_notifier_base.cc',
+            'notifier/invalidation_notifier_base.h',
+            'notifier/invalidation_notifier.cc',
             'notifier/invalidation_notifier.h',
-            'notifier/invalidation_notifier.cc',
             'notifier/invalidation_state_tracker.h',
+            'notifier/non_blocking_invalidation_notifier.cc',
             'notifier/non_blocking_invalidation_notifier.h',
-            'notifier/non_blocking_invalidation_notifier.cc',
+            'notifier/p2p_notifier.cc',
             'notifier/p2p_notifier.h',
-            'notifier/p2p_notifier.cc',
             'notifier/push_client_channel.cc',
             'notifier/push_client_channel.h',
             'notifier/registration_manager.cc',
             'notifier/registration_manager.h',
             'notifier/state_writer.h',
           ],
         }],
       ],
     },
 
@@ skipping 535 matching lines @@
             'test_suite_name': 'sync_unit_tests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sync_unit_tests<(SHARED_LIB_SUFFIX)',
             'input_jars_paths': [ '<(PRODUCT_DIR)/lib.java/chromium_base.jar', ],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }