| 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/ui_model_worker.h" | 5 #include "components/sync_driver/glue/ui_model_worker.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/macros.h" | 13 #include "base/macros.h" |
| 14 #include "base/memory/ref_counted.h" | 14 #include "base/memory/ref_counted.h" |
| 15 #include "base/run_loop.h" |
| 15 #include "base/single_thread_task_runner.h" | 16 #include "base/single_thread_task_runner.h" |
| 16 #include "base/synchronization/waitable_event.h" | 17 #include "base/synchronization/waitable_event.h" |
| 17 #include "base/threading/thread.h" | 18 #include "base/threading/thread.h" |
| 18 #include "base/threading/thread_task_runner_handle.h" | 19 #include "base/threading/thread_task_runner_handle.h" |
| 19 #include "testing/gtest/include/gtest/gtest.h" | 20 #include "testing/gtest/include/gtest/gtest.h" |
| 20 | 21 |
| 21 using browser_sync::UIModelWorker; | 22 using browser_sync::UIModelWorker; |
| 22 using syncer::SyncerError; | 23 using syncer::SyncerError; |
| 23 | 24 |
| 24 class UIModelWorkerVisitor { | 25 class UIModelWorkerVisitor { |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 base::WaitableEvent::InitialState::NOT_SIGNALED); | 89 base::WaitableEvent::InitialState::NOT_SIGNALED); |
| 89 std::unique_ptr<UIModelWorkerVisitor> v( | 90 std::unique_ptr<UIModelWorkerVisitor> v( |
| 90 new UIModelWorkerVisitor(&v_was_run, true)); | 91 new UIModelWorkerVisitor(&v_was_run, true)); |
| 91 | 92 |
| 92 syncer_thread()->task_runner()->PostTask( | 93 syncer_thread()->task_runner()->PostTask( |
| 93 FROM_HERE, | 94 FROM_HERE, |
| 94 base::Bind(&Syncer::SyncShare, base::Unretained(syncer()), v.get())); | 95 base::Bind(&Syncer::SyncShare, base::Unretained(syncer()), v.get())); |
| 95 | 96 |
| 96 // We are on the UI thread, so run our loop to process the | 97 // We are on the UI thread, so run our loop to process the |
| 97 // (hopefully) scheduled task from a SyncShare invocation. | 98 // (hopefully) scheduled task from a SyncShare invocation. |
| 98 base::MessageLoop::current()->Run(); | 99 base::RunLoop().Run(); |
| 99 syncer_thread()->Stop(); | 100 syncer_thread()->Stop(); |
| 100 } | 101 } |
| OLD | NEW |