sync: Process 'control' data separately

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.
@@ skipping 25 matching lines @@
         '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',
         'internal_api/public/engine/polling_constants.cc',
         'internal_api/public/engine/polling_constants.h',
         'internal_api/public/engine/sync_status.cc',
         'internal_api/public/engine/sync_status.h',
         'internal_api/public/sessions/error_counters.cc',
         'internal_api/public/sessions/error_counters.h',
-        'internal_api/public/sessions/syncer_status.cc',
-        'internal_api/public/sessions/syncer_status.h',
         'internal_api/public/sessions/sync_session_snapshot.cc',
         'internal_api/public/sessions/sync_session_snapshot.h',
         'internal_api/public/sessions/sync_source_info.cc',
         'internal_api/public/sessions/sync_source_info.h',
+        'internal_api/public/sessions/syncer_status.cc',
+        'internal_api/public/sessions/syncer_status.h',
         'internal_api/public/syncable/model_type.h',
         'internal_api/public/syncable/model_type_payload_map.cc',
         'internal_api/public/syncable/model_type_payload_map.h',
         'internal_api/public/util/enum_set.h',
         'internal_api/public/util/experiments.h',
         'internal_api/public/util/immutable.h',
+        'internal_api/public/util/report_unrecoverable_error_function.h',
         'internal_api/public/util/syncer_error.cc',
         'internal_api/public/util/syncer_error.h',
-        'internal_api/public/util/report_unrecoverable_error_function.h',
         'internal_api/public/util/unrecoverable_error_handler.h',
+        'internal_api/public/util/unrecoverable_error_info.cc',
         'internal_api/public/util/unrecoverable_error_info.h',
-        'internal_api/public/util/unrecoverable_error_info.cc',
         'internal_api/public/util/weak_handle.cc',
         'internal_api/public/util/weak_handle.h',
         'engine/all_status.cc',
         'engine/all_status.h',
+        'engine/apply_control_data_updates.cc',
+        'engine/apply_control_data_updates.h',
         'engine/apply_updates_command.cc',
         'engine/apply_updates_command.h',
         'engine/build_commit_command.cc',
         'engine/build_commit_command.h',
         'engine/cleanup_disabled_types_command.cc',
         'engine/cleanup_disabled_types_command.h',
         'engine/commit.cc',
         'engine/commit.h',
         'engine/conflict_resolver.cc',
         'engine/conflict_resolver.h',
@@ skipping 329 matching lines @@
         'test/fake_encryptor.h',
         'test/fake_extensions_activity_monitor.cc',
         'test/fake_extensions_activity_monitor.h',
         'test/null_directory_change_delegate.cc',
         'test/null_directory_change_delegate.h',
         'test/null_transaction_observer.cc',
         'test/null_transaction_observer.h',
         'test/sessions/test_scoped_session_event_listener.h',
         'test/test_directory_backing_store.cc',
         'test/test_directory_backing_store.h',
+        'test/test_entry_factory.cc',
+        'test/test_entry_factory.h',
         'util/test_unrecoverable_error_handler.cc',
         'util/test_unrecoverable_error_handler.h',
       ],
     },
 
     # Test support files for the 'sync_notifier' target.
     {
       'target_name': 'test_support_sync_notifier',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 95 matching lines @@
         'variables': { 'enable_wexit_time_destructors': 1, },
         'include_dirs': [
           '..',
         ],
         'sources': [
           'internal_api/public/engine/model_safe_worker_unittest.cc',
           'internal_api/public/syncable/model_type_payload_map_unittest.cc',
           'internal_api/public/util/enum_set_unittest.cc',
           'internal_api/public/util/immutable_unittest.cc',
           'engine/apply_updates_command_unittest.cc',
+          'engine/apply_control_data_updates_unittest.cc',
           'engine/build_commit_command_unittest.cc',
           'engine/cleanup_disabled_types_command_unittest.cc',
           'engine/download_updates_command_unittest.cc',
           'engine/model_changing_syncer_command_unittest.cc',
           'engine/nigori_util_unittest.cc',
           'engine/process_commit_response_command_unittest.cc',
           'engine/process_updates_command_unittest.cc',
           'engine/resolve_conflicts_command_unittest.cc',
           'engine/syncer_proto_util_unittest.cc',
           'engine/syncer_unittest.cc',
@@ skipping 246 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' ],
         },
       ],
     }],
   ],
 }