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_bookmarks/bookmark_data_type_controller.h" | 5 #include "components/sync_bookmarks/bookmark_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" |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 WillOnce(Return(syncer::SyncError())); | 121 WillOnce(Return(syncer::SyncError())); |
122 } | 122 } |
123 | 123 |
124 void Start() { | 124 void Start() { |
125 bookmark_dtc_->LoadModels( | 125 bookmark_dtc_->LoadModels( |
126 base::Bind(&ModelLoadCallbackMock::Run, | 126 base::Bind(&ModelLoadCallbackMock::Run, |
127 base::Unretained(&model_load_callback_))); | 127 base::Unretained(&model_load_callback_))); |
128 bookmark_dtc_->StartAssociating( | 128 bookmark_dtc_->StartAssociating( |
129 base::Bind(&StartCallbackMock::Run, | 129 base::Bind(&StartCallbackMock::Run, |
130 base::Unretained(&start_callback_))); | 130 base::Unretained(&start_callback_))); |
131 base::MessageLoop::current()->RunUntilIdle(); | 131 base::RunLoop().RunUntilIdle(); |
132 } | 132 } |
133 | 133 |
134 void NotifyHistoryServiceLoaded() { | 134 void NotifyHistoryServiceLoaded() { |
135 history_service_->NotifyHistoryServiceLoaded(); | 135 history_service_->NotifyHistoryServiceLoaded(); |
136 } | 136 } |
137 | 137 |
138 base::MessageLoop message_loop_; | 138 base::MessageLoop message_loop_; |
139 scoped_refptr<BookmarkDataTypeController> bookmark_dtc_; | 139 scoped_refptr<BookmarkDataTypeController> bookmark_dtc_; |
140 std::unique_ptr<SyncApiComponentFactoryMock> profile_sync_factory_; | 140 std::unique_ptr<SyncApiComponentFactoryMock> profile_sync_factory_; |
141 std::unique_ptr<BookmarkModel> bookmark_model_; | 141 std::unique_ptr<BookmarkModel> bookmark_model_; |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
173 TestingPrefServiceSimple prefs; | 173 TestingPrefServiceSimple prefs; |
174 bookmark_model_->Load(&prefs, base::FilePath(), | 174 bookmark_model_->Load(&prefs, base::FilePath(), |
175 base::ThreadTaskRunnerHandle::Get(), | 175 base::ThreadTaskRunnerHandle::Get(), |
176 base::ThreadTaskRunnerHandle::Get()); | 176 base::ThreadTaskRunnerHandle::Get()); |
177 bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model_.get()); | 177 bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model_.get()); |
178 EXPECT_EQ(DataTypeController::MODEL_LOADED, bookmark_dtc_->state()); | 178 EXPECT_EQ(DataTypeController::MODEL_LOADED, bookmark_dtc_->state()); |
179 | 179 |
180 bookmark_dtc_->StartAssociating( | 180 bookmark_dtc_->StartAssociating( |
181 base::Bind(&StartCallbackMock::Run, | 181 base::Bind(&StartCallbackMock::Run, |
182 base::Unretained(&start_callback_))); | 182 base::Unretained(&start_callback_))); |
183 base::MessageLoop::current()->RunUntilIdle(); | 183 base::RunLoop().RunUntilIdle(); |
184 | |
185 | 184 |
186 EXPECT_EQ(DataTypeController::RUNNING, bookmark_dtc_->state()); | 185 EXPECT_EQ(DataTypeController::RUNNING, bookmark_dtc_->state()); |
187 } | 186 } |
188 | 187 |
189 TEST_F(SyncBookmarkDataTypeControllerTest, StartHistoryServiceNotReady) { | 188 TEST_F(SyncBookmarkDataTypeControllerTest, StartHistoryServiceNotReady) { |
190 CreateBookmarkModel(LOAD_MODEL); | 189 CreateBookmarkModel(LOAD_MODEL); |
191 SetStartExpectations(); | 190 SetStartExpectations(); |
192 EXPECT_CALL(*history_service_.get(), BackendLoaded()) | 191 EXPECT_CALL(*history_service_.get(), BackendLoaded()) |
193 .WillRepeatedly(Return(false)); | 192 .WillRepeatedly(Return(false)); |
194 | 193 |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
298 SetStopExpectations(); | 297 SetStopExpectations(); |
299 | 298 |
300 EXPECT_EQ(DataTypeController::NOT_RUNNING, bookmark_dtc_->state()); | 299 EXPECT_EQ(DataTypeController::NOT_RUNNING, bookmark_dtc_->state()); |
301 | 300 |
302 EXPECT_CALL(start_callback_, Run(DataTypeController::OK, _, _)); | 301 EXPECT_CALL(start_callback_, Run(DataTypeController::OK, _, _)); |
303 Start(); | 302 Start(); |
304 EXPECT_EQ(DataTypeController::RUNNING, bookmark_dtc_->state()); | 303 EXPECT_EQ(DataTypeController::RUNNING, bookmark_dtc_->state()); |
305 bookmark_dtc_->Stop(); | 304 bookmark_dtc_->Stop(); |
306 EXPECT_EQ(DataTypeController::NOT_RUNNING, bookmark_dtc_->state()); | 305 EXPECT_EQ(DataTypeController::NOT_RUNNING, bookmark_dtc_->state()); |
307 } | 306 } |
OLD | NEW |