Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(261)

Unified Diff: chrome/browser/sync/engine/model_safe_worker.cc

Issue 8366030: Introduce the plumbing necessary to report Unrecoverable error from model safe workers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: For try jobs. Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/engine/model_safe_worker.cc
diff --git a/chrome/browser/sync/engine/model_safe_worker.cc b/chrome/browser/sync/engine/model_safe_worker.cc
index ae94b265de3361ae000af9318337e9f48ee29d0d..907d75efd083679a95c29fa1461e5e540e97da48 100644
--- a/chrome/browser/sync/engine/model_safe_worker.cc
+++ b/chrome/browser/sync/engine/model_safe_worker.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "chrome/browser/sync/engine/model_safe_worker.h"
+#include "chrome/browser/sync/util/unrecoverable_error_info.h"
#include "base/json/json_writer.h"
#include "base/memory/scoped_ptr.h"
@@ -74,8 +75,10 @@ ModelSafeWorker::ModelSafeWorker() {}
ModelSafeWorker::~ModelSafeWorker() {}
-void ModelSafeWorker::DoWorkAndWaitUntilDone(Callback0::Type* work) {
- work->Run(); // For GROUP_PASSIVE, we do the work on the current thread.
+UnrecoverableErrorInfo ModelSafeWorker::DoWorkAndWaitUntilDone(
+ const WorkCallback& work) {
+ // For GROUP_PASSIVE, we do the work on the current thread.
+ return work.Run();
}
ModelSafeGroup ModelSafeWorker::GetModelSafeGroup() {
« no previous file with comments | « chrome/browser/sync/engine/model_safe_worker.h ('k') | chrome/browser/sync/glue/browser_thread_model_worker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698