Index: chrome/browser/sync/glue/password_model_worker.cc |
diff --git a/chrome/browser/sync/glue/password_model_worker.cc b/chrome/browser/sync/glue/password_model_worker.cc |
index 1b4ad83f9bb8f478ed90824711b261c7a0f48fab..c4a1d169ede9dfb7fc616ba7bf3062923599bc68 100644 |
--- a/chrome/browser/sync/glue/password_model_worker.cc |
+++ b/chrome/browser/sync/glue/password_model_worker.cc |
@@ -13,6 +13,7 @@ |
using base::WaitableEvent; |
namespace browser_sync { |
+using sessions::UnrecoverableErrorInfo; |
PasswordModelWorker::PasswordModelWorker(PasswordStore* password_store) |
: password_store_(password_store) { |
@@ -21,17 +22,22 @@ PasswordModelWorker::PasswordModelWorker(PasswordStore* password_store) |
PasswordModelWorker::~PasswordModelWorker() {} |
-void PasswordModelWorker::DoWorkAndWaitUntilDone(Callback0::Type* work) { |
+UnrecoverableErrorInfo PasswordModelWorker::DoWorkAndWaitUntilDone( |
+ Callback1<sessions::UnrecoverableErrorInfo*>::Type* work) { |
WaitableEvent done(false, false); |
+ UnrecoverableErrorInfo error_info; |
password_store_->ScheduleTask( |
NewRunnableMethod(this, &PasswordModelWorker::CallDoWorkAndSignalTask, |
- work, &done)); |
+ work, &done, &error_info)); |
done.Wait(); |
+ return error_info; |
} |
-void PasswordModelWorker::CallDoWorkAndSignalTask(Callback0::Type* work, |
- WaitableEvent* done) { |
- work->Run(); |
+void PasswordModelWorker::CallDoWorkAndSignalTask( |
+ Callback1<UnrecoverableErrorInfo*>::Type* work, |
+ WaitableEvent* done, |
+ UnrecoverableErrorInfo* error_info) { |
+ work->Run(error_info); |
done->Signal(); |
} |