[Sync] Add support for proxy types

chrome/browser/sync/glue/sync_backend_host.cc

Index: chrome/browser/sync/glue/sync_backend_host.cc
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc
index 974e7b15a68f395251cec5d6e3e0e56288774046..b0f9406dade6c51b00e2b20ab57b766818044e71 100644
--- a/chrome/browser/sync/glue/sync_backend_host.cc
+++ b/chrome/browser/sync/glue/sync_backend_host.cc
@@ -685,6 +685,7 @@ void SyncBackendHost::ConfigureDataTypes(
       GetDataTypesInState(ENABLED, config_state_map),
       syncer::Union(GetDataTypesInState(DISABLED, config_state_map),
                     GetDataTypesInState(FAILED, config_state_map)));
+  types_to_download.RemoveAll(syncer::VirtualTypes());
   if (!types_to_download.Empty())
     types_to_download.Put(syncer::NIGORI);
 
@@ -1368,7 +1369,8 @@ void SyncBackendHost::Core::DoFinishConfigureDataTypes(
   // Update the enabled types for the bridge and sync manager.
   syncer::ModelSafeRoutingInfo routing_info;
   registrar_->GetModelSafeRoutingInfo(&routing_info);
-  const syncer::ModelTypeSet enabled_types = GetRoutingInfoTypes(routing_info);
+  syncer::ModelTypeSet enabled_types = GetRoutingInfoTypes(routing_info);
+  enabled_types.RemoveAll(syncer::VirtualTypes());
   sync_manager_->UpdateEnabledTypes(enabled_types);
 
   const syncer::ModelTypeSet failed_configuration_types =