| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "sync/internal_api/model_type_connector_proxy.h" | 5 #include "components/sync/core_impl/model_type_connector_proxy.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| 11 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
| 12 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
| 13 #include "base/run_loop.h" | 13 #include "base/run_loop.h" |
| 14 #include "base/sequenced_task_runner.h" | 14 #include "base/sequenced_task_runner.h" |
| 15 #include "base/threading/thread_task_runner_handle.h" | 15 #include "base/threading/thread_task_runner_handle.h" |
| 16 #include "sync/api/fake_model_type_service.h" | 16 #include "components/sync/api/fake_model_type_service.h" |
| 17 #include "sync/internal_api/public/activation_context.h" | 17 #include "components/sync/base/model_type.h" |
| 18 #include "sync/internal_api/public/base/model_type.h" | 18 #include "components/sync/core/activation_context.h" |
| 19 #include "sync/internal_api/public/model_type_connector.h" | 19 #include "components/sync/core/model_type_connector.h" |
| 20 #include "sync/internal_api/public/shared_model_type_processor.h" | 20 #include "components/sync/core/shared_model_type_processor.h" |
| 21 #include "sync/internal_api/public/test/data_type_error_handler_mock.h" | 21 #include "components/sync/core/test/data_type_error_handler_mock.h" |
| 22 #include "sync/sessions/model_type_registry.h" | 22 #include "components/sync/sessions_impl/model_type_registry.h" |
| 23 #include "sync/test/engine/mock_nudge_handler.h" | 23 #include "components/sync/test/engine/mock_nudge_handler.h" |
| 24 #include "sync/test/engine/test_directory_setter_upper.h" | 24 #include "components/sync/test/engine/test_directory_setter_upper.h" |
| 25 #include "testing/gtest/include/gtest/gtest.h" | 25 #include "testing/gtest/include/gtest/gtest.h" |
| 26 | 26 |
| 27 namespace syncer_v2 { | 27 namespace syncer_v2 { |
| 28 | 28 |
| 29 class ModelTypeConnectorProxyTest : public ::testing::Test, | 29 class ModelTypeConnectorProxyTest : public ::testing::Test, |
| 30 FakeModelTypeService { | 30 FakeModelTypeService { |
| 31 public: | 31 public: |
| 32 ModelTypeConnectorProxyTest() | 32 ModelTypeConnectorProxyTest() |
| 33 : sync_task_runner_(base::ThreadTaskRunnerHandle::Get()), | 33 : sync_task_runner_(base::ThreadTaskRunnerHandle::Get()), |
| 34 type_task_runner_(base::ThreadTaskRunnerHandle::Get()) {} | 34 type_task_runner_(base::ThreadTaskRunnerHandle::Get()) {} |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 OnSyncStarting(processor.get()); | 129 OnSyncStarting(processor.get()); |
| 130 | 130 |
| 131 base::RunLoop run_loop_; | 131 base::RunLoop run_loop_; |
| 132 run_loop_.RunUntilIdle(); | 132 run_loop_.RunUntilIdle(); |
| 133 | 133 |
| 134 EXPECT_TRUE(processor->IsConnected()); | 134 EXPECT_TRUE(processor->IsConnected()); |
| 135 DisableSync(); | 135 DisableSync(); |
| 136 } | 136 } |
| 137 | 137 |
| 138 } // namespace syncer_v2 | 138 } // namespace syncer_v2 |
| OLD | NEW |