diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 00:58:14 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 00:58:14 +0000 |
| commit | 7df2d35dd54de39672acd39ee8e7590479c89b95 (patch) | |
| tree | 11b4127dc3bd3a292d17dd00bafafd043061d90f /sync/engine/sync_scheduler_unittest.cc | |
| parent | 66bfba6684d26e1eeaed4eacdb5a7e77f11c6725 (diff) | |
| download | chromium_src-7df2d35dd54de39672acd39ee8e7590479c89b95.zip chromium_src-7df2d35dd54de39672acd39ee8e7590479c89b95.tar.gz chromium_src-7df2d35dd54de39672acd39ee8e7590479c89b95.tar.bz2 | |
Revert "Lock-free shutdown of profile sync service. Changes include:"
Introduced shutdown crashes. See bug crbug.com/259974 for discussion.
Original codereview at https://chromiumcodereview.appspot.com/16770005
This also reverts "Disconnect non-frontend processor using the processor in "
due to its depdency on the above patch.
Original codereview at https://chromiumcodereview.appspot.com/5878607637381120
BUG=19757,259974
TBR=haitaol@chromium.org
Review URL: https://codereview.chromium.org/18890004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211506 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine/sync_scheduler_unittest.cc')
| -rw-r--r-- | sync/engine/sync_scheduler_unittest.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sync/engine/sync_scheduler_unittest.cc b/sync/engine/sync_scheduler_unittest.cc index 426f10f..4f2c56e 100644 --- a/sync/engine/sync_scheduler_unittest.cc +++ b/sync/engine/sync_scheduler_unittest.cc @@ -201,10 +201,8 @@ class SyncSchedulerTest : public testing::Test { // This stops the scheduler synchronously. void StopSyncScheduler() { - base::MessageLoop::current()->PostTask( - FROM_HERE, - base::Bind(&SyncSchedulerTest::DoQuitLoopNow, - weak_ptr_factory_.GetWeakPtr())); + scheduler()->RequestStop(base::Bind(&SyncSchedulerTest::DoQuitLoopNow, + weak_ptr_factory_.GetWeakPtr())); RunLoop(); } @@ -234,8 +232,8 @@ class SyncSchedulerTest : public testing::Test { return dir_maker_.directory(); } - base::MessageLoop loop_; base::WeakPtrFactory<SyncSchedulerTest> weak_ptr_factory_; + base::MessageLoop message_loop_; TestDirectorySetterUpper dir_maker_; scoped_ptr<MockConnectionManager> connection_; scoped_ptr<SyncSessionContext> context_; |