Commit 0790a915 authored by vitaliii's avatar vitaliii Committed by Commit Bot

[Sync::Cleanup] Do not handle NOTREACHED failures in SyncPrefs.

Change-Id: I1a8ef527472d65b5f24b7357fe9ac6b153879d03
Reviewed-on: https://chromium-review.googlesource.com/1124848
Commit-Queue: vitaliii <vitaliii@chromium.org>
Reviewed-by: default avatarMikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#572557}
parent 65c229f8
...@@ -433,20 +433,14 @@ void SyncPrefs::RegisterDataTypePreferredPref( ...@@ -433,20 +433,14 @@ void SyncPrefs::RegisterDataTypePreferredPref(
ModelType type, ModelType type,
bool is_preferred) { bool is_preferred) {
const char* pref_name = GetPrefNameForDataType(type); const char* pref_name = GetPrefNameForDataType(type);
if (!pref_name) { DCHECK(pref_name);
NOTREACHED();
return;
}
registry->RegisterBooleanPref(pref_name, is_preferred); registry->RegisterBooleanPref(pref_name, is_preferred);
} }
bool SyncPrefs::GetDataTypePreferred(ModelType type) const { bool SyncPrefs::GetDataTypePreferred(ModelType type) const {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
const char* pref_name = GetPrefNameForDataType(type); const char* pref_name = GetPrefNameForDataType(type);
if (!pref_name) { DCHECK(pref_name);
NOTREACHED();
return false;
}
if (AlwaysPreferredUserTypes().Has(type)) if (AlwaysPreferredUserTypes().Has(type))
return true; return true;
...@@ -465,10 +459,7 @@ bool SyncPrefs::GetDataTypePreferred(ModelType type) const { ...@@ -465,10 +459,7 @@ bool SyncPrefs::GetDataTypePreferred(ModelType type) const {
void SyncPrefs::SetDataTypePreferred(ModelType type, bool is_preferred) { void SyncPrefs::SetDataTypePreferred(ModelType type, bool is_preferred) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
const char* pref_name = GetPrefNameForDataType(type); const char* pref_name = GetPrefNameForDataType(type);
if (!pref_name) { DCHECK(pref_name);
NOTREACHED();
return;
}
if (AlwaysPreferredUserTypes().Has(type)) if (AlwaysPreferredUserTypes().Has(type))
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment