Chromium Code Reviews| Index: components/sync/driver/glue/sync_backend_registrar_unittest.cc |
| diff --git a/components/sync/driver/glue/sync_backend_registrar_unittest.cc b/components/sync/driver/glue/sync_backend_registrar_unittest.cc |
| index 9192a4090b8864281d08048e535cd76a51e2b7a2..125d3a1507d55d7826bebcad7efa707741099c90 100644 |
| --- a/components/sync/driver/glue/sync_backend_registrar_unittest.cc |
| +++ b/components/sync/driver/glue/sync_backend_registrar_unittest.cc |
| @@ -80,31 +80,29 @@ class SyncBackendRegistrarTest : public testing::Test { |
| protected: |
| SyncBackendRegistrarTest() |
| - : db_thread_("DBThreadForTest"), file_thread_("FileThreadForTest") {} |
| + : db_thread_("DBThreadForTest"), |
| + file_thread_("FileThreadForTest"), |
| + sync_thread_("SyncThreadForTest") {} |
| ~SyncBackendRegistrarTest() override {} |
| void SetUp() override { |
| db_thread_.StartAndWaitForTesting(); |
| file_thread_.StartAndWaitForTesting(); |
| + sync_thread_.StartAndWaitForTesting(); |
| test_user_share_.SetUp(); |
| sync_client_ = base::MakeUnique<RegistrarSyncClient>( |
| ui_task_runner(), db_task_runner(), file_task_runner()); |
| registrar_ = base::MakeUnique<SyncBackendRegistrar>( |
| - "test", sync_client_.get(), std::unique_ptr<base::Thread>(), |
| - ui_task_runner(), db_task_runner(), file_task_runner()); |
| + "test", sync_client_.get(), ui_task_runner(), db_task_runner(), |
| + file_task_runner()); |
| } |
| void TearDown() override { |
| registrar_->RequestWorkerStopOnUIThread(); |
| test_user_share_.TearDown(); |
| - { |
| - std::unique_ptr<base::Thread> released_sync_thread = |
| - registrar_->ReleaseSyncThread(); |
| - released_sync_thread->task_runner()->DeleteSoon(FROM_HERE, |
| - registrar_.release()); |
| - // |released_sync_thread| is joined at the end of this scope. |
| - } |
| + sync_thread_.task_runner()->DeleteSoon(FROM_HERE, registrar_.release()); |
| + sync_thread_.WaitUntilThreadStarted(); |
|
Nicolas Zea
2016/11/07 20:29:46
Until "thread started"? Should this be until idle?
maxbogue
2016/11/07 23:12:05
Whoops, you're right, this is a bad merge from bef
|
| base::RunLoop().RunUntilIdle(); |
| } |
| @@ -145,6 +143,7 @@ class SyncBackendRegistrarTest : public testing::Test { |
| base::MessageLoop message_loop_; |
| base::Thread db_thread_; |
| base::Thread file_thread_; |
| + base::Thread sync_thread_; |
| TestUserShare test_user_share_; |
| std::unique_ptr<RegistrarSyncClient> sync_client_; |