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

Unified Diff: chrome/browser/sync/engine/model_changing_syncer_command.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_changing_syncer_command.cc
diff --git a/chrome/browser/sync/engine/model_changing_syncer_command.cc b/chrome/browser/sync/engine/model_changing_syncer_command.cc
index 797f795f96bd08580aeb6ac466459e231e7c7763..407c299c8d262da807a2f0bb3aed67384d988598 100644
--- a/chrome/browser/sync/engine/model_changing_syncer_command.cc
+++ b/chrome/browser/sync/engine/model_changing_syncer_command.cc
@@ -4,10 +4,12 @@
#include "chrome/browser/sync/engine/model_changing_syncer_command.h"
+#include "base/basictypes.h"
#include "base/callback_old.h"
#include "chrome/browser/sync/engine/model_safe_worker.h"
#include "chrome/browser/sync/sessions/status_controller.h"
#include "chrome/browser/sync/sessions/sync_session.h"
+#include "chrome/browser/sync/util/unrecoverable_error_info.h"
namespace browser_sync {
@@ -45,9 +47,15 @@ void ModelChangingSyncerCommand::ExecuteImpl(sessions::SyncSession* session) {
sessions::StatusController* status = work_session_->status_controller();
sessions::ScopedModelSafeGroupRestriction r(status, group);
- scoped_ptr<Callback0::Type> c(NewCallback(this,
- &ModelChangingSyncerCommand::StartChangingModel));
- worker->DoWorkAndWaitUntilDone(c.get());
+ WorkCallback c = base::Bind(
+ &ModelChangingSyncerCommand::StartChangingModel,
+ // We wait until the callback is executed. So it is safe to use
+ // unretained.
+ base::Unretained(this));
+
+ // TODO(lipalani): Check the return value for an unrecoverable error.
+ ignore_result(worker->DoWorkAndWaitUntilDone(c));
+
}
}
« no previous file with comments | « chrome/browser/sync/engine/model_changing_syncer_command.h ('k') | chrome/browser/sync/engine/model_safe_worker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698