FYI: Control Data + Per-Device Metadata

sync/sessions/sync_session.cc

Index: sync/sessions/sync_session.cc
diff --git a/sync/sessions/sync_session.cc b/sync/sessions/sync_session.cc
index f4329785378060a7750b70ff5e38d6e74790236c..f43b0a5a029834cf898fc2196583f53dbd5809ba 100644
--- a/sync/sessions/sync_session.cc
+++ b/sync/sessions/sync_session.cc
@@ -27,9 +27,11 @@ std::set<ModelSafeGroup> ComputeEnabledGroups(
        it != routing_info.end(); ++it) {
     enabled_groups.insert(it->second);
   }
-  // GROUP_PASSIVE is always enabled, since that's the group that
-  // top-level folders map to.
+  // GROUP_PASSIVE is always enabled, since that's the group that top-level
+  // folders map to.
+  // GROUP_CONTROL manages some meta-data types that are always enabled.
   enabled_groups.insert(GROUP_PASSIVE);
+  enabled_groups.insert(GROUP_CONTROL);
   if (DCHECK_IS_ON()) {
     // We sometimes create dummy SyncSession objects (see
     // SyncScheduler::InitialSnapshot) so don't check in that case.