sync: Per-type update application

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 b9c778057e2081e2d692928b2db442c16b460e08..845e11b26f2bce9f06a930b341e59ea922657356 100644
--- a/sync/engine/syncer_unittest.cc
+++ b/sync/engine/syncer_unittest.cc
@@ -189,7 +189,7 @@ class SyncerTest : public testing::Test,
 
     EXPECT_TRUE(
         syncer_->NormalSyncShare(
-            GetRoutingInfoTypes(context_->routing_info()),
+            context_->enabled_types(),
             nudge_tracker_,
             session_.get()));
   }
@@ -197,7 +197,7 @@ class SyncerTest : public testing::Test,
   void SyncShareConfigure() {
     session_.reset(SyncSession::Build(context_.get(), this));
     EXPECT_TRUE(syncer_->ConfigureSyncShare(
-            GetRoutingInfoTypes(context_->routing_info()),
+            context_->enabled_types(),
             sync_pb::GetUpdatesCallerInfo::RECONFIGURATION,
             session_.get()));
   }
@@ -530,8 +530,7 @@ TEST_F(SyncerTest, GetCommitIdsFiltersThrottledEntries) {
 
   // Now sync without enabling bookmarks.
   syncer_->NormalSyncShare(
-      Difference(GetRoutingInfoTypes(context_->routing_info()),
-                 ModelTypeSet(BOOKMARKS)),
+      Difference(context_->enabled_types(), ModelTypeSet(BOOKMARKS)),
       nudge_tracker_,
       session_.get());
 
@@ -545,7 +544,7 @@ TEST_F(SyncerTest, GetCommitIdsFiltersThrottledEntries) {
 
   // Sync again with bookmarks enabled.
   syncer_->NormalSyncShare(
-      GetRoutingInfoTypes(context_->routing_info()),
+      context_->enabled_types(),
       nudge_tracker_,
       session_.get());
   SyncShareNudge();