[Sync] Add support for proxy types

chrome/browser/sync/glue/model_association_manager.cc

Index: chrome/browser/sync/glue/model_association_manager.cc
diff --git a/chrome/browser/sync/glue/model_association_manager.cc b/chrome/browser/sync/glue/model_association_manager.cc
index 2739ede7e78f771a50a0bb383a752dd7f3f5de2b..e748829ff07dda586073d980c835f15935014748 100644
--- a/chrome/browser/sync/glue/model_association_manager.cc
+++ b/chrome/browser/sync/glue/model_association_manager.cc
@@ -334,7 +334,8 @@ void ModelAssociationManager::TypeStartCallback(
   // occurred.
   if ((DataTypeController::IsSuccessfulResult(start_result) ||
        start_result == DataTypeController::ASSOCIATION_FAILED) &&
-      debug_info_listener_.IsInitialized()) {
+      debug_info_listener_.IsInitialized() &&
+      syncer::ProtocolTypes().Has(local_merge_result.model_type())) {
     syncer::DataTypeAssociationStats stats =
         BuildAssociationStatsFromMergeResults(local_merge_result,
                                               syncer_merge_result);