Move files from //chrome/browser/sync to sync_driver component.

components/sync_driver/model_association_manager.cc

 // Copyright (c) 2012 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 "chrome/browser/sync/glue/model_association_manager.h"
+#include "components/sync_driver/model_association_manager.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
-#include "content/public/browser/browser_thread.h"
 #include "sync/internal_api/public/base/model_type.h"
 
-using content::BrowserThread;
 using syncer::ModelTypeSet;
 
 namespace browser_sync {
 
 namespace {
 
 static const syncer::ModelType kStartOrder[] = {
   syncer::NIGORI,               //  Listed for completeness.
   syncer::DEVICE_INFO,          //  Listed for completeness.
   syncer::EXPERIMENTS,          //  Listed for completeness.
@@ skipping 301 matching lines @@
                    type, base::TimeTicks::Now()));
   }
 }
 
 void ModelAssociationManager::TypeStartCallback(
     syncer::ModelType type,
     base::TimeTicks type_start_time,
     DataTypeController::StartResult start_result,
     const syncer::SyncMergeResult& local_merge_result,
     const syncer::SyncMergeResult& syncer_merge_result) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

[blundell, 2014/02/01 13:18:32]

Do you think it's worth preserving this DCHECK by injecting a ui_thread or using
a ThreadChecker (if this class is set up on the UI thread)?

[Nicolas Zea, 2014/02/03 19:21:36]

Removing it is fine, all these classes are UI thread only.

-
   // TODO(haitaol): temporary fix for 335606.
   if (slow_types_.Has(type))
     return;
 
   // This happens when slow associating type is disabled by new configuration.
   if (!desired_types_.Has(type))
     return;
 
   slow_types_.Remove(type);
 
@@ skipping 100 matching lines @@
 
   result_processor_->OnModelAssociationDone(result);
 }
 
 base::OneShotTimer<ModelAssociationManager>*
     ModelAssociationManager::GetTimerForTesting() {
   return &timer_;
 }
 
 }  // namespace browser_sync