commit a0f3d164c7bb26b7677cddc30b2e1f740d68542d
author Marc Treib <treib@chromium.org> Thu Jan 10 09:43:59 2019
committer Commit Bot <commit-bot@chromium.org> Thu Jan 10 09:43:59 2019
tree a3018a536db3ca52ec78e3dbaffcc8c4286b8198
parent 494ae7b5b117ad07921b77dd2b5474ff62f02748

Reland: sync_integration_tests: don't instantiate ScopedFeatureList in test body

This is a reland of https://crrev.com/c/1402799. The original CL was
reverted for supposedly introducing flakiness, but in fact in only
renamed an already-flaky test. That test has since been disabled, so
trying again.

Creating a ScopedFeatureList instance in the test body creates a data
race related to the global FeatureList instance: The ScopedFeatureList
overrides the global instance, and then it gets reset after the test
body; however, the feature list might still be queried from the Sync
thread after that.

This CL avoids the issue by instead creating test (sub)classes to hold
the ScopedFeatureLists.

Bug: 915219
Change-Id: Iaa6185d0dd9a042a9275100e3b1cae1eceb52633
Reviewed-on: https://chromium-review.googlesource.com/c/1402890
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#621523}