GitLab

This reverts commit e16309d9.

Reason for revert: This landed in the same build batch where the TwoClientEventSyncTest broke. Looking at the CL description, this seems related. See https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8861341071397738112/+/steps/sync_integration_tests_on__none__GPU_on_Mac_on_Mac-10.13.6/0/logs/Deterministic_failure:_TwoClientUserEventsSyncTest.SetPassphraseAndRecordEventAndThenSetupSync__status_FAILURE_/0

Original change's description:
> [floc] Remove the EventTrigger field in the FlocIdComputed event
>
> Why: That field is never used & not useful for the server side analysis.
>
> This CL also removes a workaround that disables the initial floc
> loggings when permission disallows
> (in FlocIdProviderImpl::LogFlocComputedEvent). We had this workaround
> because otherwise the logging would mess up with the user event
> expectations in SingleClientUserEventsSyncTest, but that workaround is
> not ideal. This CL fixes it by disabling kFlocIdComputedEventLogging for
> the test suite, and adds a new test for the enabled case. The impact
> of this fix is it will cause additional events to be logged.
>
>
> Bug: 1148358
> Change-Id: I70cef531b89b434b5572b419acc8dd2412888498
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2572733
> Reviewed-by: Josh Karlin <jkarlin@chromium.org>
> Reviewed-by: Marc Treib <treib@chromium.org>
> Commit-Queue: Yao Xiao <yaoxia@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#835468}

TBR=treib@chromium.org,jkarlin@chromium.org,yaoxia@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com

Change-Id: I1095984a9a38063e0d722d7c78fb9f83538977eb
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1148358
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2582222Reviewed-by: Martin Šrámek <msramek@chromium.org>
Commit-Queue: Martin Šrámek <msramek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835585}