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

components/sync_driver/model_association_manager.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/sync_driver/model_association_manager.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/logging.h"
 #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;
 
 namespace sync_driver {
 
 namespace {
 
 static const syncer::ModelType kStartOrder[] = {
   syncer::NIGORI,               //  Listed for completeness.
@@ skipping 393 matching lines @@
 
   delegate_->OnModelAssociationDone(result);
 }
 
 base::OneShotTimer<ModelAssociationManager>*
     ModelAssociationManager::GetTimerForTesting() {
   return &timer_;
 }
 
 }  // namespace sync_driver