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

Unified Diff: chrome/browser/sync/glue/fake_data_type_controller.cc

Issue 15701022: [Sync] Add support for sync Persistence Errors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move bookmark change into separate patch Created 7 years, 6 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
« no previous file with comments | « chrome/browser/sync/glue/failed_data_types_handler.cc ('k') | chrome/browser/sync/glue/favicon_cache.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/fake_data_type_controller.cc
diff --git a/chrome/browser/sync/glue/fake_data_type_controller.cc b/chrome/browser/sync/glue/fake_data_type_controller.cc
index d424a1a98a4d50ba502b4b6bdcc477ad653ed0b9..f21f27b03d464b820ff2f761c7bee64cb011df93 100644
--- a/chrome/browser/sync/glue/fake_data_type_controller.cc
+++ b/chrome/browser/sync/glue/fake_data_type_controller.cc
@@ -64,11 +64,17 @@ void FakeDataTypeController::FinishStart(StartResult result) {
} else if (result == ASSOCIATION_FAILED) {
state_ = DISABLED;
local_merge_result.set_error(
- syncer::SyncError(FROM_HERE, "Association failed", type()));
+ syncer::SyncError(FROM_HERE,
+ syncer::SyncError::DATATYPE_ERROR,
+ "Association failed",
+ type()));
} else {
state_ = NOT_RUNNING;
local_merge_result.set_error(
- syncer::SyncError(FROM_HERE, "Fake error", type()));
+ syncer::SyncError(FROM_HERE,
+ syncer::SyncError::DATATYPE_ERROR,
+ "Fake error",
+ type()));
}
StartCallback start_callback = last_start_callback_;
last_start_callback_.Reset();
@@ -89,7 +95,10 @@ void FakeDataTypeController::Stop() {
// The DTM still expects |last_start_callback_| to be called back.
if (!last_start_callback_.is_null()) {
- syncer::SyncError error(FROM_HERE, "Fake error", type_);
+ syncer::SyncError error(FROM_HERE,
+ syncer::SyncError::DATATYPE_ERROR,
+ "Fake error",
+ type_);
syncer::SyncMergeResult local_merge_result(type_);
local_merge_result.set_error(error);
last_start_callback_.Run(ABORTED,
« no previous file with comments | « chrome/browser/sync/glue/failed_data_types_handler.cc ('k') | chrome/browser/sync/glue/favicon_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698