| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/sync/glue/password_model_worker.h" | 5 #include "chrome/browser/sync/glue/password_model_worker.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
| 9 #include "base/synchronization/waitable_event.h" | 9 #include "base/synchronization/waitable_event.h" |
| 10 #include "chrome/browser/password_manager/password_store.h" | 10 #include "chrome/browser/password_manager/password_store.h" |
| 11 | 11 |
| 12 using base::WaitableEvent; | 12 using base::WaitableEvent; |
| 13 | 13 |
| 14 namespace browser_sync { | 14 namespace browser_sync { |
| 15 | 15 |
| 16 PasswordModelWorker::PasswordModelWorker(PasswordStore* password_store) | 16 PasswordModelWorker::PasswordModelWorker(PasswordStore* password_store) |
| 17 : password_store_(password_store) { | 17 : password_store_(password_store) { |
| 18 DCHECK(password_store); | 18 DCHECK(password_store); |
| 19 } | 19 } |
| 20 | 20 |
| 21 PasswordModelWorker::~PasswordModelWorker() {} | 21 PasswordModelWorker::~PasswordModelWorker() {} |
| 22 | 22 |
| 23 UnrecoverableErrorInfo PasswordModelWorker::DoWorkAndWaitUntilDone( | 23 SyncerError PasswordModelWorker::DoWorkAndWaitUntilDone( |
| 24 const WorkCallback& work) { | 24 const WorkCallback& work) { |
| 25 WaitableEvent done(false, false); | 25 WaitableEvent done(false, false); |
| 26 UnrecoverableErrorInfo error_info; | 26 SyncerError error = UNSET; |
| 27 password_store_->ScheduleTask( | 27 password_store_->ScheduleTask( |
| 28 base::Bind(&PasswordModelWorker::CallDoWorkAndSignalTask, | 28 base::Bind(&PasswordModelWorker::CallDoWorkAndSignalTask, |
| 29 this, work, &done, &error_info)); | 29 this, work, &done, &error)); |
| 30 done.Wait(); | 30 done.Wait(); |
| 31 return error_info; | 31 return error; |
| 32 } | 32 } |
| 33 | 33 |
| 34 void PasswordModelWorker::CallDoWorkAndSignalTask( | 34 void PasswordModelWorker::CallDoWorkAndSignalTask( |
| 35 const WorkCallback& work, | 35 const WorkCallback& work, |
| 36 WaitableEvent* done, | 36 WaitableEvent* done, |
| 37 UnrecoverableErrorInfo* error_info) { | 37 SyncerError *error) { |
| 38 *error_info = work.Run(); | 38 *error = work.Run(); |
| 39 done->Signal(); | 39 done->Signal(); |
| 40 } | 40 } |
| 41 | 41 |
| 42 ModelSafeGroup PasswordModelWorker::GetModelSafeGroup() { | 42 ModelSafeGroup PasswordModelWorker::GetModelSafeGroup() { |
| 43 return GROUP_PASSWORD; | 43 return GROUP_PASSWORD; |
| 44 } | 44 } |
| 45 | 45 |
| 46 } // namespace browser_sync | 46 } // namespace browser_sync |
| OLD | NEW |