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

Unified Diff: components/sync/model_impl/model_type_store_impl.cc

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/sync/model_impl/model_type_store_impl.cc
diff --git a/components/sync/model_impl/model_type_store_impl.cc b/components/sync/model_impl/model_type_store_impl.cc
index 671cdc1e2943fce33a4055ea34eb24a94a6214db..a4d02948e846ff34cafcde7397bdcfd66e048a94 100644
--- a/components/sync/model_impl/model_type_store_impl.cc
+++ b/components/sync/model_impl/model_type_store_impl.cc
@@ -11,6 +11,7 @@
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
+#include "base/optional.h"
#include "base/task_runner_util.h"
#include "base/threading/thread_task_runner_handle.h"
#include "components/sync/model/model_error.h"
@@ -308,7 +309,7 @@ void ModelTypeStoreImpl::DeserializeMetadata(
metadata_batch->AddMetadata(r.id, entity_metadata);
}
- callback.Run(ModelError(), std::move(metadata_batch));
+ callback.Run({}, std::move(metadata_batch));
}
std::unique_ptr<ModelTypeStore::WriteBatch>

Powered by Google App Engine
This is Rietveld 408576698