OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "components/sync_driver/frontend_data_type_controller.h" | 5 #include "components/sync_driver/frontend_data_type_controller.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
11 #include "base/callback.h" | 11 #include "base/callback.h" |
12 #include "base/location.h" | 12 #include "base/location.h" |
13 #include "base/message_loop/message_loop.h" | 13 #include "base/message_loop/message_loop.h" |
| 14 #include "base/run_loop.h" |
14 #include "base/single_thread_task_runner.h" | 15 #include "base/single_thread_task_runner.h" |
15 #include "base/threading/thread_task_runner_handle.h" | 16 #include "base/threading/thread_task_runner_handle.h" |
16 #include "base/tracked_objects.h" | 17 #include "base/tracked_objects.h" |
17 #include "components/sync_driver/change_processor_mock.h" | 18 #include "components/sync_driver/change_processor_mock.h" |
18 #include "components/sync_driver/data_type_controller_mock.h" | 19 #include "components/sync_driver/data_type_controller_mock.h" |
19 #include "components/sync_driver/fake_sync_client.h" | 20 #include "components/sync_driver/fake_sync_client.h" |
20 #include "components/sync_driver/fake_sync_service.h" | 21 #include "components/sync_driver/fake_sync_service.h" |
21 #include "components/sync_driver/frontend_data_type_controller_mock.h" | 22 #include "components/sync_driver/frontend_data_type_controller_mock.h" |
22 #include "components/sync_driver/model_associator_mock.h" | 23 #include "components/sync_driver/model_associator_mock.h" |
23 #include "components/sync_driver/sync_api_component_factory_mock.h" | 24 #include "components/sync_driver/sync_api_component_factory_mock.h" |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 void Start() { | 143 void Start() { |
143 frontend_dtc_->LoadModels( | 144 frontend_dtc_->LoadModels( |
144 base::Bind(&ModelLoadCallbackMock::Run, | 145 base::Bind(&ModelLoadCallbackMock::Run, |
145 base::Unretained(&model_load_callback_))); | 146 base::Unretained(&model_load_callback_))); |
146 frontend_dtc_->StartAssociating( | 147 frontend_dtc_->StartAssociating( |
147 base::Bind(&StartCallbackMock::Run, | 148 base::Bind(&StartCallbackMock::Run, |
148 base::Unretained(&start_callback_))); | 149 base::Unretained(&start_callback_))); |
149 PumpLoop(); | 150 PumpLoop(); |
150 } | 151 } |
151 | 152 |
152 void PumpLoop() { base::MessageLoop::current()->RunUntilIdle(); } | 153 void PumpLoop() { base::RunLoop().RunUntilIdle(); } |
153 | 154 |
154 base::MessageLoop message_loop_; | 155 base::MessageLoop message_loop_; |
155 scoped_refptr<FrontendDataTypeControllerFake> frontend_dtc_; | 156 scoped_refptr<FrontendDataTypeControllerFake> frontend_dtc_; |
156 SyncApiComponentFactoryMock profile_sync_factory_; | 157 SyncApiComponentFactoryMock profile_sync_factory_; |
157 scoped_refptr<FrontendDataTypeControllerMock> dtc_mock_; | 158 scoped_refptr<FrontendDataTypeControllerMock> dtc_mock_; |
158 sync_driver::FakeSyncService service_; | 159 sync_driver::FakeSyncService service_; |
159 ModelAssociatorMock* model_associator_; | 160 ModelAssociatorMock* model_associator_; |
160 ChangeProcessorMock* change_processor_; | 161 ChangeProcessorMock* change_processor_; |
161 StartCallbackMock start_callback_; | 162 StartCallbackMock start_callback_; |
162 ModelLoadCallbackMock model_load_callback_; | 163 ModelLoadCallbackMock model_load_callback_; |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
260 SetActivateExpectations(DataTypeController::OK); | 261 SetActivateExpectations(DataTypeController::OK); |
261 SetStopExpectations(); | 262 SetStopExpectations(); |
262 EXPECT_EQ(DataTypeController::NOT_RUNNING, frontend_dtc_->state()); | 263 EXPECT_EQ(DataTypeController::NOT_RUNNING, frontend_dtc_->state()); |
263 Start(); | 264 Start(); |
264 EXPECT_EQ(DataTypeController::RUNNING, frontend_dtc_->state()); | 265 EXPECT_EQ(DataTypeController::RUNNING, frontend_dtc_->state()); |
265 frontend_dtc_->Stop(); | 266 frontend_dtc_->Stop(); |
266 EXPECT_EQ(DataTypeController::NOT_RUNNING, frontend_dtc_->state()); | 267 EXPECT_EQ(DataTypeController::NOT_RUNNING, frontend_dtc_->state()); |
267 } | 268 } |
268 | 269 |
269 } // namespace | 270 } // namespace |
OLD | NEW |