[Sync] //components/sync external changes [DO NOT SUBMIT]

components/sync_driver/ui_data_type_controller.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/ui_data_type_controller.h"
 
 #include <utility>
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "components/sync/api/sync_error.h"
+#include "components/sync/api/sync_merge_result.h"
+#include "components/sync/api/syncable_service.h"
+#include "components/sync/base/data_type_histogram.h"
+#include "components/sync/base/model_type.h"
 #include "components/sync_driver/generic_change_processor_factory.h"
 #include "components/sync_driver/shared_change_processor_ref.h"
 #include "components/sync_driver/sync_client.h"
 #include "components/sync_driver/sync_service.h"
-#include "sync/api/sync_error.h"
-#include "sync/api/sync_merge_result.h"
-#include "sync/api/syncable_service.h"
-#include "sync/internal_api/public/base/model_type.h"
-#include "sync/util/data_type_histogram.h"
 
 namespace sync_driver {
 
 UIDataTypeController::UIDataTypeController()
     : DirectoryDataTypeController(base::ThreadTaskRunnerHandle::Get(),
                                   base::Closure()),
       sync_client_(NULL),
       state_(NOT_RUNNING),
       type_(syncer::UNSPECIFIED) {}
 
@@ skipping 352 matching lines @@
                             ModelTypeToHistogramInt(type()),
                             syncer::MODEL_TYPE_COUNT);
 #define PER_DATA_TYPE_MACRO(type_str)                                    \
   UMA_HISTOGRAM_ENUMERATION("Sync." type_str "ConfigureFailure", result, \
                             MAX_CONFIGURE_RESULT);
   SYNC_DATA_TYPE_HISTOGRAM(type());
 #undef PER_DATA_TYPE_MACRO
 }
 
 }  // namespace sync_driver