| Index: components/variations/variations_associated_data.cc
|
| diff --git a/components/variations/variations_associated_data.cc b/components/variations/variations_associated_data.cc
|
| index ec1224524c4f6e2ab5308de24825dfbb2cdfcffd..b4e6b013df5a3a6cf70a7497080274e17342846d 100644
|
| --- a/components/variations/variations_associated_data.cc
|
| +++ b/components/variations/variations_associated_data.cc
|
| @@ -39,13 +39,21 @@ class GroupMapAccessor {
|
| const VariationID id,
|
| const bool force) {
|
| #if !defined(NDEBUG)
|
| - DCHECK_EQ(3, ID_COLLECTION_COUNT);
|
| - // Ensure that at most one of the trigger/non-trigger web property IDs are
|
| - // set.
|
| - if (key == GOOGLE_WEB_PROPERTIES || key == GOOGLE_WEB_PROPERTIES_TRIGGER) {
|
| - IDCollectionKey other_key = key == GOOGLE_WEB_PROPERTIES ?
|
| - GOOGLE_WEB_PROPERTIES_TRIGGER : GOOGLE_WEB_PROPERTIES;
|
| - DCHECK_EQ(EMPTY_ID, GetID(other_key, group_identifier));
|
| + DCHECK_EQ(4, ID_COLLECTION_COUNT);
|
| + // Ensure that at most one of the trigger/non-trigger/signed-in web property
|
| + // IDs are set.
|
| + if (key == GOOGLE_WEB_PROPERTIES || key == GOOGLE_WEB_PROPERTIES_TRIGGER ||
|
| + key == GOOGLE_WEB_PROPERTIES_SIGNED_IN) {
|
| + if (key != GOOGLE_WEB_PROPERTIES)
|
| + DCHECK_EQ(EMPTY_ID, GetID(GOOGLE_WEB_PROPERTIES, group_identifier));
|
| + if (key != GOOGLE_WEB_PROPERTIES_TRIGGER) {
|
| + DCHECK_EQ(EMPTY_ID,
|
| + GetID(GOOGLE_WEB_PROPERTIES_TRIGGER, group_identifier));
|
| + }
|
| + if (key != GOOGLE_WEB_PROPERTIES_SIGNED_IN) {
|
| + DCHECK_EQ(EMPTY_ID,
|
| + GetID(GOOGLE_WEB_PROPERTIES_SIGNED_IN, group_identifier));
|
| + }
|
| }
|
|
|
| // Validate that all collections with this |group_identifier| have the same
|
|
|