diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-23 21:29:21 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-23 21:29:21 +0000 |
| commit | 3f50ec4bb2a006f9285053b3877a7b9cd634da0a (patch) | |
| tree | 38f28684bc24c9062dd81ff86a1d8b7ea9b08593 /chrome/browser/sync | |
| parent | 4a225032c9eef31b2afbd36249f7ca949095b08e (diff) | |
| download | chromium_src-3f50ec4bb2a006f9285053b3877a7b9cd634da0a.zip chromium_src-3f50ec4bb2a006f9285053b3877a7b9cd634da0a.tar.gz chromium_src-3f50ec4bb2a006f9285053b3877a7b9cd634da0a.tar.bz2 | |
base::Bind: Random remaining cleanups.
BUG=none
TEST=none
R=groby,csilv,ajwong
Review URL: http://codereview.chromium.org/9035012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115737 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/glue/ui_model_worker.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/sync/glue/ui_model_worker_unittest.cc | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/sync/glue/ui_model_worker.cc b/chrome/browser/sync/glue/ui_model_worker.cc index 7753e6a..c7ca1c5 100644 --- a/chrome/browser/sync/glue/ui_model_worker.cc +++ b/chrome/browser/sync/glue/ui_model_worker.cc @@ -17,6 +17,7 @@ namespace browser_sync { namespace { +// A simple callback to signal a waitable event after running a closure. void CallDoWorkAndSignalCallback(const WorkCallback& work, base::WaitableEvent* work_done, UIModelWorker* const scheduler, @@ -32,6 +33,7 @@ void CallDoWorkAndSignalCallback(const WorkCallback& work, // actually gets destroyed. return; } + *error_info = work.Run(); // Notify the UIModelWorker that scheduled us that we have run @@ -131,5 +133,4 @@ ModelSafeGroup UIModelWorker::GetModelSafeGroup() { return GROUP_UI; } - } // namespace browser_sync diff --git a/chrome/browser/sync/glue/ui_model_worker_unittest.cc b/chrome/browser/sync/glue/ui_model_worker_unittest.cc index b6b83db..577447e 100644 --- a/chrome/browser/sync/glue/ui_model_worker_unittest.cc +++ b/chrome/browser/sync/glue/ui_model_worker_unittest.cc @@ -66,6 +66,7 @@ void FakeSyncapiShutdownCallback(base::Thread* syncer_thread, base::WaitableEvent** jobs, size_t job_count) { base::WaitableEvent all_jobs_done(false, false); + // In real life, we would try and close a sync directory, which would // result in the syncer calling it's own destructor, which results in // the SyncerThread::HaltSyncer being called, which sets the |