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

components/sync_driver/data_type_controller.h

 // 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.
 
 #ifndef COMPONENTS_SYNC_DRIVER_DATA_TYPE_CONTROLLER_H__
 #define COMPONENTS_SYNC_DRIVER_DATA_TYPE_CONTROLLER_H__
 
 #include <map>
 #include <string>
 
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_delete_on_message_loop.h"
 #include "base/sequenced_task_runner_helpers.h"
-#include "sync/internal_api/public/base/model_type.h"
-#include "sync/internal_api/public/data_type_error_handler.h"
-#include "sync/internal_api/public/util/unrecoverable_error_handler.h"
+#include "components/sync/base/model_type.h"
+#include "components/sync/base/unrecoverable_error_handler.h"
+#include "components/sync/core/data_type_error_handler.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace syncer {
 class SyncError;
 class SyncMergeResult;
 }
 
@@ skipping 141 matching lines @@
   // TODO(sync): protected for use by legacy controllers.
   base::Closure error_callback_;
 
  private:
   const scoped_refptr<base::SingleThreadTaskRunner> ui_thread_;
 };
 
 }  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_DATA_TYPE_CONTROLLER_H__