| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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 #if defined(BROWSER_SYNC) | |
| 5 | 4 |
| 6 #include "base/thread.h" | 5 #include "base/thread.h" |
| 7 #include "chrome/browser/sync/engine/syncapi.h" | 6 #include "chrome/browser/sync/engine/syncapi.h" |
| 8 #include "chrome/browser/sync/glue/bookmark_model_worker.h" | 7 #include "chrome/browser/sync/glue/bookmark_model_worker.h" |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 8 #include "testing/gtest/include/gtest/gtest.h" |
| 10 | 9 |
| 11 using browser_sync::BookmarkModelWorker; | 10 using browser_sync::BookmarkModelWorker; |
| 12 using namespace sync_api; | 11 using namespace sync_api; |
| 13 | 12 |
| 14 // Various boilerplate, primarily for the StopWithPendingWork test. | 13 // Various boilerplate, primarily for the StopWithPendingWork test. |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 new FakeSyncShareTask(syncer(), fox3.get())); | 212 new FakeSyncShareTask(syncer(), fox3.get())); |
| 214 | 213 |
| 215 // This is what gets the UI thread blocked until NotifyExitRequested, | 214 // This is what gets the UI thread blocked until NotifyExitRequested, |
| 216 // which is called when FakeSyncapiShutdownTask runs and deletes the syncer. | 215 // which is called when FakeSyncapiShutdownTask runs and deletes the syncer. |
| 217 bmw()->Stop(); | 216 bmw()->Stop(); |
| 218 | 217 |
| 219 // Was the thread killed? | 218 // Was the thread killed? |
| 220 EXPECT_FALSE(syncer_thread()->IsRunning()); | 219 EXPECT_FALSE(syncer_thread()->IsRunning()); |
| 221 core_thread()->Stop(); | 220 core_thread()->Stop(); |
| 222 } | 221 } |
| 223 | |
| 224 #endif // defined(BROWSER_SYNC) | |
| OLD | NEW |