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

components/sync_driver/frontend_data_type_controller.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 "components/sync_driver/frontend_data_type_controller.h"
 
 #include "base/logging.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/base/data_type_histogram.h"
+#include "components/sync/base/model_type.h"
 #include "components/sync_driver/change_processor.h"
 #include "components/sync_driver/model_associator.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/internal_api/public/base/model_type.h"
-#include "sync/util/data_type_histogram.h"
 
 namespace browser_sync {
 
 FrontendDataTypeController::FrontendDataTypeController(
     const scoped_refptr<base::SingleThreadTaskRunner>& ui_thread,
     const base::Closure& error_callback,
     sync_driver::SyncClient* sync_client)
     : DirectoryDataTypeController(ui_thread, error_callback),
       sync_client_(sync_client),
       state_(NOT_RUNNING) {
@@ skipping 259 matching lines @@
     const {
   return change_processor_.get();
 }
 
 void FrontendDataTypeController::set_change_processor(
     sync_driver::ChangeProcessor* change_processor) {
   change_processor_.reset(change_processor);
 }
 
 }  // namespace browser_sync