| 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 826cf21f6d066f0f1367df51ae807524eb7fe415..84c95e448ebb838afa6f19566b1202892b4d197a 100644
|
| --- a/chrome/browser/sync/glue/password_model_worker.cc
|
| +++ b/chrome/browser/sync/glue/password_model_worker.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -20,22 +20,22 @@ PasswordModelWorker::PasswordModelWorker(PasswordStore* password_store)
|
|
|
| PasswordModelWorker::~PasswordModelWorker() {}
|
|
|
| -UnrecoverableErrorInfo PasswordModelWorker::DoWorkAndWaitUntilDone(
|
| +SyncerError PasswordModelWorker::DoWorkAndWaitUntilDone(
|
| const WorkCallback& work) {
|
| WaitableEvent done(false, false);
|
| - UnrecoverableErrorInfo error_info;
|
| + SyncerError error = UNSET;
|
| password_store_->ScheduleTask(
|
| base::Bind(&PasswordModelWorker::CallDoWorkAndSignalTask,
|
| - this, work, &done, &error_info));
|
| + this, work, &done, &error));
|
| done.Wait();
|
| - return error_info;
|
| + return error;
|
| }
|
|
|
| void PasswordModelWorker::CallDoWorkAndSignalTask(
|
| const WorkCallback& work,
|
| WaitableEvent* done,
|
| - UnrecoverableErrorInfo* error_info) {
|
| - *error_info = work.Run();
|
| + SyncerError *error) {
|
| + *error = work.Run();
|
| done->Signal();
|
| }
|
|
|
|
|