FYI: Control Data + Per-Device Metadata

sync/engine/syncer_unittest.cc

Index: sync/engine/syncer_unittest.cc
diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc
index 7372f68c1872c29d27e0ccfa820f90220d426cfe..f404951e6bd46555f3dce07b29f457d43aedbc22 100644
--- a/sync/engine/syncer_unittest.cc
+++ b/sync/engine/syncer_unittest.cc
@@ -146,7 +146,8 @@ class SyncerTest : public testing::Test,
   }
 
   void GetWorkers(std::vector<ModelSafeWorker*>* out) {
-    out->push_back(worker_.get());
+    out->push_back(control_worker_.get());
+    out->push_back(passive_worker_.get());
   }
 
   void GetModelSafeRoutingInfo(ModelSafeRoutingInfo* out) {
@@ -154,7 +155,11 @@ class SyncerTest : public testing::Test,
     // the SyncerThread.  Datatypes which aren't enabled aren't in the map.
     for (ModelTypeSet::Iterator it = enabled_datatypes_.First();
          it.Good(); it.Inc()) {
-      (*out)[it.Get()] = GROUP_PASSIVE;
+      if (!IsControlType(it.Get())) {
+        (*out)[it.Get()] = GROUP_PASSIVE;
+      } else {
+        (*out)[it.Get()] = GROUP_CONTROL;
+      }
     }
   }
 
@@ -222,7 +227,8 @@ class SyncerTest : public testing::Test,
     EnableDatatype(NIGORI);
     EnableDatatype(PREFERENCES);
     EnableDatatype(NIGORI);
-    worker_ = new FakeModelWorker(GROUP_PASSIVE);
+    passive_worker_ = new FakeModelWorker(GROUP_PASSIVE);
+    control_worker_ = new FakeModelWorker(GROUP_CONTROL);
     std::vector<SyncEngineEventListener*> listeners;
     listeners.push_back(this);
 
@@ -561,7 +567,8 @@ class SyncerTest : public testing::Test,
   base::TimeDelta last_short_poll_interval_received_;
   base::TimeDelta last_long_poll_interval_received_;
   base::TimeDelta last_sessions_commit_delay_seconds_;
-  scoped_refptr<ModelSafeWorker> worker_;
+  scoped_refptr<ModelSafeWorker> passive_worker_;
+  scoped_refptr<ModelSafeWorker> control_worker_;
 
   ModelTypeSet enabled_datatypes_;
   TrafficRecorder traffic_recorder_;
@@ -994,7 +1001,7 @@ TEST_F(SyncerTest, ReceiveOldNigori) {
       other_encrypted_specifics.mutable_encrypted());
   sync_pb::EntitySpecifics our_encrypted_specifics;
   our_encrypted_specifics.mutable_bookmark()->set_title("title2");
-  ModelTypeSet encrypted_types = ModelTypeSet::All();
+  ModelTypeSet encrypted_types = syncer::EncryptableTypes();
 
 
   // Receive the initial nigori node.
@@ -1086,7 +1093,7 @@ TEST_F(SyncerTest, NigoriConflicts) {
 
   // Receive the initial nigori node.
   SyncShareNudge();
-  encrypted_types = ModelTypeSet::All();
+  encrypted_types = syncer::EncryptableTypes();
   {
     // Local changes with different passphrase, different types.
     WriteTransaction wtrans(FROM_HERE, UNITTEST, directory());