[Sync] Add support for proxy types

sync/internal_api/sync_manager_impl_unittest.cc

Index: sync/internal_api/sync_manager_impl_unittest.cc
diff --git a/sync/internal_api/sync_manager_impl_unittest.cc b/sync/internal_api/sync_manager_impl_unittest.cc
index aed4432d3528992f8d0c3811e4771d9e83e76c0e..e599d4d39a2b9f4c5c5fa79df6df483ac25faf74 100644
--- a/sync/internal_api/sync_manager_impl_unittest.cc
+++ b/sync/internal_api/sync_manager_impl_unittest.cc
@@ -2826,6 +2826,8 @@ TEST_F(SyncManagerTestWithMockScheduler, MAYBE_BasicConfiguration) {
   // Set data for all types.
   for (ModelTypeSet::Iterator iter = ModelTypeSet::All().First(); iter.Good();
        iter.Inc()) {
+    if (LocalTypes().Has(iter.Get()))
+      continue;
     SetProgressMarkerForType(iter.Get(), true);
   }
 
@@ -3028,6 +3030,8 @@ TEST_F(SyncManagerTest, MAYBE_PurgeDisabledTypes) {
   // Set progress markers for all types.
   for (ModelTypeSet::Iterator iter = ModelTypeSet::All().First(); iter.Good();
        iter.Inc()) {
+    if (LocalTypes().Has(iter.Get()))
+      continue;
     SetProgressMarkerForType(iter.Get(), true);
   }