Change ProcessSyncChanges type in SyncableService and change processor
No behavior is changed. The interface methods are altered to return an
optional ModelError instead of the older SyncError. To achieve this,
some helper methods in the implementations must be changed in that
same way, which is a natural step in the final goal of eliminating
the SyncError class.
Change-Id: I7211eb1613aabb8bce9273765c943a3ec1fd958c
Bug: 1057577
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2093482
Commit-Queue: Victor Vianna <[email protected]>
Reviewed-by: Vasilii Sukhanov <[email protected]>
Reviewed-by: Marc Treib <[email protected]>
Reviewed-by: Mikel Astiz <[email protected]>
Cr-Commit-Position: refs/heads/master@{#759613}
diff --git a/chrome/browser/extensions/extension_service_sync_unittest.cc b/chrome/browser/extensions/extension_service_sync_unittest.cc
index a49513f0..ed520a8 100644
--- a/chrome/browser/extensions/extension_service_sync_unittest.cc
+++ b/chrome/browser/extensions/extension_service_sync_unittest.cc
@@ -150,7 +150,7 @@
// changes for us, but in addition we "apply" these changes by treating
// the FakeSyncChangeProcessor's SyncDataList as a map keyed by extension
// id.
- syncer::SyncError ProcessSyncChanges(
+ base::Optional<syncer::ModelError> ProcessSyncChanges(
const base::Location& from_here,
const syncer::SyncChangeList& change_list) override {
syncer::FakeSyncChangeProcessor::ProcessSyncChanges(from_here, change_list);
@@ -180,7 +180,7 @@
ADD_FAILURE() << "Unexpected change type " << change.change_type();
}
}
- return syncer::SyncError();
+ return base::nullopt;
}
// We override this to help catch the error of trying to use a single
