FYI: Control Data + Per-Device Metadata

sync/sync.gyp

Index: sync/sync.gyp
diff --git a/sync/sync.gyp b/sync/sync.gyp
index 6a38127ce3fac936e6aaff25cc3063944b3bfbc8..aa1dbda4d7ad223ff2d0de765e49d23daaca9219 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -44,6 +44,8 @@
         '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/control_model_worker.cc',
+        'internal_api/public/engine/control_model_worker.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',
@@ -72,6 +74,8 @@
         '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',
@@ -439,6 +443,8 @@
         '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',
       ],
@@ -560,6 +566,7 @@
           'internal_api/public/engine/model_safe_worker_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/download_updates_command_unittest.cc',
           'engine/model_changing_syncer_command_unittest.cc',