Sync: Refactoring DataTypeController to make the design shareable with USS datatypes.

components/sync_driver/model_association_manager.cc

Index: components/sync_driver/model_association_manager.cc
diff --git a/components/sync_driver/model_association_manager.cc b/components/sync_driver/model_association_manager.cc
index 6924712fecabb73ca02a507856dfc786753c3fa7..7602385a1071eb79302697fc74d8853b9030a8ee 100644
--- a/components/sync_driver/model_association_manager.cc
+++ b/components/sync_driver/model_association_manager.cc
@@ -11,6 +11,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/trace_event/trace_event.h"
+#include "sync/api/sync_merge_result.h"
 #include "sync/internal_api/public/base/model_type.h"
 
 using syncer::ModelTypeSet;