FYI: Control Data + Per-Device Metadata

sync/util/cryptographer.cc

Index: sync/util/cryptographer.cc
diff --git a/sync/util/cryptographer.cc b/sync/util/cryptographer.cc
index c512ab6bf24c7c10a80b166c9b96ec8367b675da..ce2fc173efa1d8b941086761cbdc492bc4810241 100644
--- a/sync/util/cryptographer.cc
+++ b/sync/util/cryptographer.cc
@@ -441,13 +441,13 @@ void Cryptographer::UpdateNigoriFromEncryptedTypes(
 
 void Cryptographer::set_encrypt_everything() {
   if (encrypt_everything_) {
-    DCHECK(encrypted_types_.Equals(ModelTypeSet::All()));
+    DCHECK(encrypted_types_.Equals(syncer::EncryptableTypes()));
     return;
   }
   encrypt_everything_ = true;
   // Change |encrypted_types_| directly to avoid sending more than one
   // notification.
-  encrypted_types_ = ModelTypeSet::All();
+  encrypted_types_ = syncer::EncryptableTypes();
   EmitEncryptedTypesChangedNotification();
 }