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

Unified Diff: components/reading_list/ios/reading_list_model_unittest.mm

Issue 2623723002: [Sync] Remove ModelError::IsSet() in favor of base::Optional. (Closed)
Patch Set: Rebase. Created 3 years, 11 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: components/reading_list/ios/reading_list_model_unittest.mm
diff --git a/components/reading_list/ios/reading_list_model_unittest.mm b/components/reading_list/ios/reading_list_model_unittest.mm
index f5ee9c99cd11e0f223da2c21ef5df436179d3c96..bdcc008462f268f71095840916b18c48dd060831 100644
--- a/components/reading_list/ios/reading_list_model_unittest.mm
+++ b/components/reading_list/ios/reading_list_model_unittest.mm
@@ -110,18 +110,18 @@ class TestReadingListStorage : public ReadingListModelStorage {
return std::unique_ptr<syncer::MetadataChangeList>();
}
- syncer::ModelError MergeSyncData(
+ base::Optional<syncer::ModelError> MergeSyncData(
std::unique_ptr<syncer::MetadataChangeList> metadata_change_list,
syncer::EntityDataMap entity_data_map) override {
NOTREACHED();
- return syncer::ModelError();
+ return {};
}
- syncer::ModelError ApplySyncChanges(
+ base::Optional<syncer::ModelError> ApplySyncChanges(
std::unique_ptr<syncer::MetadataChangeList> metadata_change_list,
syncer::EntityChangeList entity_changes) override {
NOTREACHED();
- return syncer::ModelError();
+ return {};
}
void GetData(StorageKeyList storage_keys, DataCallback callback) override {

Powered by Google App Engine
This is Rietveld 408576698