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

Unified Diff: components/sync/model_impl/shared_model_type_processor.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/shared_model_type_processor.cc
diff --git a/components/sync/model_impl/shared_model_type_processor.cc b/components/sync/model_impl/shared_model_type_processor.cc
index 5b3fd3561ed86291f15f7660343efeafb8c06b28..e6cc241001107b5e0468d6e158493dd327e5af75 100644
--- a/components/sync/model_impl/shared_model_type_processor.cc
+++ b/components/sync/model_impl/shared_model_type_processor.cc
@@ -97,9 +97,9 @@ void SharedModelTypeProcessor::ConnectIfReady() {
return;
}
- if (start_error_.IsSet()) {
- error_handler_.Run(start_error_);
- start_error_ = ModelError();
+ if (start_error_) {
+ error_handler_.Run(start_error_.value());
+ start_error_.reset();
start_callback_.Reset();
return;
}
@@ -141,14 +141,12 @@ bool SharedModelTypeProcessor::IsTrackingMetadata() {
}
void SharedModelTypeProcessor::ReportError(const ModelError& error) {
- DCHECK(error.IsSet());
-
if (ConnectPreconditionsMet()) {
// If both model and sync are ready, then |start_callback_| was already
// called and this can't be treated as a start error.
DCHECK(!error_handler_.is_null());
error_handler_.Run(error);
- } else if (!start_error_.IsSet()) {
+ } else if (!start_error_) {
start_error_ = error;
// An early model error means we're no longer expecting OnMetadataLoaded to
// be called.
@@ -305,10 +303,10 @@ void SharedModelTypeProcessor::OnCommitCompleted(
}
}
- ModelError error =
+ base::Optional<ModelError> error =
bridge_->ApplySyncChanges(std::move(change_list), EntityChangeList());
- if (error.IsSet()) {
- ReportError(error);
+ if (error) {
+ ReportError(error.value());
}
}
@@ -362,11 +360,11 @@ void SharedModelTypeProcessor::OnUpdateReceived(
}
// Inform the bridge of the new or updated data.
- ModelError error =
+ base::Optional<ModelError> error =
bridge_->ApplySyncChanges(std::move(metadata_changes), entity_changes);
- if (error.IsSet()) {
- ReportError(error);
+ if (error) {
+ ReportError(error.value());
} else {
// There may be new reasons to commit by the time this function is done.
FlushPendingCommitRequests();
@@ -555,11 +553,11 @@ void SharedModelTypeProcessor::OnInitialUpdateReceived(
}
// Let the bridge handle associating and merging the data.
- ModelError error =
+ base::Optional<ModelError> error =
bridge_->MergeSyncData(std::move(metadata_changes), data_map);
- if (error.IsSet()) {
- ReportError(error);
+ if (error) {
+ ReportError(error.value());
} else {
// We may have new reasons to commit by the time this function is done.
FlushPendingCommitRequests();

Powered by Google App Engine
This is Rietveld 408576698