| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "base/callback.h" | 5 #include "base/callback.h" |
| 6 #include "base/message_loop.h" | 6 #include "base/message_loop.h" |
| 7 #include "base/ref_counted.h" | 7 #include "base/ref_counted.h" |
| 8 #include "base/thread.h" | 8 #include "base/threading/thread.h" |
| 9 #include "base/waitable_event.h" | 9 #include "base/waitable_event.h" |
| 10 #include "chrome/browser/sync/engine/syncapi.h" | 10 #include "chrome/browser/sync/engine/syncapi.h" |
| 11 #include "chrome/browser/sync/glue/ui_model_worker.h" | 11 #include "chrome/browser/sync/glue/ui_model_worker.h" |
| 12 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
| 13 | 13 |
| 14 using browser_sync::UIModelWorker; | 14 using browser_sync::UIModelWorker; |
| 15 using namespace sync_api; | 15 using namespace sync_api; |
| 16 | 16 |
| 17 // Various boilerplate, primarily for the StopWithPendingWork test. | 17 // Various boilerplate, primarily for the StopWithPendingWork test. |
| 18 | 18 |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 new FakeSyncShareTask(syncer(), fox3.get())); | 218 new FakeSyncShareTask(syncer(), fox3.get())); |
| 219 | 219 |
| 220 // This is what gets the UI thread blocked until NotifyExitRequested, | 220 // This is what gets the UI thread blocked until NotifyExitRequested, |
| 221 // which is called when FakeSyncapiShutdownTask runs and deletes the syncer. | 221 // which is called when FakeSyncapiShutdownTask runs and deletes the syncer. |
| 222 bmw()->Stop(); | 222 bmw()->Stop(); |
| 223 | 223 |
| 224 // Was the thread killed? | 224 // Was the thread killed? |
| 225 EXPECT_FALSE(syncer_thread()->IsRunning()); | 225 EXPECT_FALSE(syncer_thread()->IsRunning()); |
| 226 core_thread()->Stop(); | 226 core_thread()->Stop(); |
| 227 } | 227 } |
| OLD | NEW |