https://chromium-review.googlesource.com/c/chromium/src/+/1124333

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/26fa7866f96f9c6d0ac5088470b70b8becdf9df3

commit 26fa7866f96f9c6d0ac5088470b70b8becdf9df3
Author: vitaliii <vitaliii@chromium.org>
Date: Wed Jul 04 15:36:55 2018

[Sync::Consent] Don't link UserEventService if separate datatype is used.

Previously ConsentAuditor did get UserEventService even when the
separate consents datatype was used. In this CL, the UserEventService is
just not requested from ConsentAuditor factory at all in this case (on
all platforms). Also DCHECKs in ConsentAuditor are adjusted to check only
the correct dependency based on the feature.

Bug:  851438 
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I756e595b826e084d1b2f9905d2827cae1160fedd
Reviewed-on: https://chromium-review.googlesource.com/1124333
Reviewed-by: Markus Heintz <markusheintz@chromium.org>
Commit-Queue: vitaliii <vitaliii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#572580}
[modify] https://crrev.com/26fa7866f96f9c6d0ac5088470b70b8becdf9df3/chrome/browser/consent_auditor/consent_auditor_factory.cc
[modify] https://crrev.com/26fa7866f96f9c6d0ac5088470b70b8becdf9df3/components/consent_auditor/consent_auditor.cc
[modify] https://crrev.com/26fa7866f96f9c6d0ac5088470b70b8becdf9df3/ios/chrome/browser/consent_auditor/consent_auditor_factory.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/3e58c1bdf3e023826eb620a681ab4a594cee1182

commit 3e58c1bdf3e023826eb620a681ab4a594cee1182
Author: vitaliii <vitaliii@chromium.org>
Date: Thu Jul 05 12:36:05 2018

[Sync::Consent] Add DCHECK enforcing only one dependency.

In ConsentAuditor constructor check that only the right dependency
(either ConsentSyncBridge or UserEventService based on feature) is
not nullptr.

This is a followup to
https://chromium-review.googlesource.com/c/chromium/src/+/1124333.

Bug:  851438 
Change-Id: I2d25ec88627e118f0d4e0fd967ec59eab97489cd
Reviewed-on: https://chromium-review.googlesource.com/1127020
Reviewed-by: Markus Heintz <markusheintz@chromium.org>
Commit-Queue: vitaliii <vitaliii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#572771}
[modify] https://crrev.com/3e58c1bdf3e023826eb620a681ab4a594cee1182/components/consent_auditor/consent_auditor.cc
[modify] https://crrev.com/3e58c1bdf3e023826eb620a681ab4a594cee1182/components/consent_auditor/consent_auditor_unittest.cc