| 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/glue/browser_thread_model_worker.h" | 5 #include "components/sync/driver/glue/browser_thread_model_worker.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/location.h" | 9 #include "base/location.h" |
| 10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 // DoWork is called first. | 61 // DoWork is called first. |
| 62 void Timeout() { | 62 void Timeout() { |
| 63 ADD_FAILURE() << "Timed out waiting for work to be done on the DB thread."; | 63 ADD_FAILURE() << "Timed out waiting for work to be done on the DB thread."; |
| 64 main_message_loop_.task_runner()->PostTask( | 64 main_message_loop_.task_runner()->PostTask( |
| 65 FROM_HERE, base::MessageLoop::QuitWhenIdleClosure()); | 65 FROM_HERE, base::MessageLoop::QuitWhenIdleClosure()); |
| 66 } | 66 } |
| 67 | 67 |
| 68 protected: | 68 protected: |
| 69 void SetUp() override { | 69 void SetUp() override { |
| 70 db_thread_.Start(); | 70 db_thread_.Start(); |
| 71 worker_ = new BrowserThreadModelWorker(db_thread_.task_runner(), GROUP_DB, | 71 worker_ = new BrowserThreadModelWorker(db_thread_.task_runner(), GROUP_DB); |
| 72 nullptr); | |
| 73 } | 72 } |
| 74 | 73 |
| 75 virtual void Teardown() { | 74 virtual void Teardown() { |
| 76 worker_ = nullptr; | 75 worker_ = nullptr; |
| 77 db_thread_.Stop(); | 76 db_thread_.Stop(); |
| 78 } | 77 } |
| 79 | 78 |
| 80 private: | 79 private: |
| 81 base::MessageLoop main_message_loop_; | 80 base::MessageLoop main_message_loop_; |
| 82 Thread db_thread_; | 81 Thread db_thread_; |
| 83 bool did_do_work_; | 82 bool did_do_work_; |
| 84 scoped_refptr<BrowserThreadModelWorker> worker_; | 83 scoped_refptr<BrowserThreadModelWorker> worker_; |
| 85 base::OneShotTimer timer_; | 84 base::OneShotTimer timer_; |
| 86 | 85 |
| 87 base::WeakPtrFactory<SyncBrowserThreadModelWorkerTest> weak_factory_; | 86 base::WeakPtrFactory<SyncBrowserThreadModelWorkerTest> weak_factory_; |
| 88 }; | 87 }; |
| 89 | 88 |
| 90 TEST_F(SyncBrowserThreadModelWorkerTest, DoesWorkOnDatabaseThread) { | 89 TEST_F(SyncBrowserThreadModelWorkerTest, DoesWorkOnDatabaseThread) { |
| 91 base::ThreadTaskRunnerHandle::Get()->PostTask( | 90 base::ThreadTaskRunnerHandle::Get()->PostTask( |
| 92 FROM_HERE, base::Bind(&SyncBrowserThreadModelWorkerTest::ScheduleWork, | 91 FROM_HERE, base::Bind(&SyncBrowserThreadModelWorkerTest::ScheduleWork, |
| 93 factory()->GetWeakPtr())); | 92 factory()->GetWeakPtr())); |
| 94 base::RunLoop().Run(); | 93 base::RunLoop().Run(); |
| 95 EXPECT_TRUE(did_do_work()); | 94 EXPECT_TRUE(did_do_work()); |
| 96 } | 95 } |
| 97 | 96 |
| 98 } // namespace | 97 } // namespace |
| 99 | 98 |
| 100 } // namespace syncer | 99 } // namespace syncer |
| OLD | NEW |