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

components/sync_driver/non_ui_data_type_controller_unittest.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/non_ui_data_type_controller.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/tracked_objects.h"
+#include "components/sync/api/fake_syncable_service.h"
+#include "components/sync/api/sync_change.h"
+#include "components/sync/engine/model_safe_worker.h"
 #include "components/sync_driver/data_type_controller_mock.h"
 #include "components/sync_driver/fake_sync_client.h"
 #include "components/sync_driver/generic_change_processor_factory.h"
 #include "components/sync_driver/non_ui_data_type_controller_mock.h"
-#include "sync/api/fake_syncable_service.h"
-#include "sync/api/sync_change.h"
-#include "sync/internal_api/public/engine/model_safe_worker.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sync_driver {
 
 class SyncClient;
 
 namespace {
 
 using base::WaitableEvent;
@@ skipping 463 matching lines @@
       FROM_HERE,
       base::Bind(
           &NonUIDataTypeControllerFake::OnSingleDataTypeUnrecoverableError,
           non_ui_dtc_.get(), error));
   WaitForDTC();
 }
 
 }  // namespace
 
 }  // namespace sync_driver