commit 1b046c87b8bf8cee36873b9ccb917a5195fbe92e
author Findit <findit-for-me@appspot.gserviceaccount.com> Wed Jan 09 15:23:22 2019
committer Findit <findit-for-me@appspot.gserviceaccount.com> Wed Jan 09 15:23:22 2019
tree 6d115d318db50ab77d42b898c91a529caeec6b5e
parent 007850b95fe68fc29f2d615500d9a4e31d530da3

Revert "sync_integration_tests: don't instantiate ScopedFeatureList in test body"

This reverts commit d0b30b2fe3396d4ca76e348f0a39ea74a8ad2b98.

Reason for revert:

Findit (https://goo.gl/kROfz5) identified CL at revision 621134 as the
culprit for flakes in the build cycles as shown on:
https://findit-for-me.appspot.com/waterfall/flake/flake-culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyQwsSDEZsYWtlQ3VscHJpdCIxY2hyb21pdW0vZDBiMzBiMmZlMzM5NmQ0Y2E3NmUzNDhmMGEzOWVhNzRhOGFkMmI5OAw

Sample Failed Build: https://ci.chromium.org/buildbot/chromium.memory/Linux%20TSan%20Tests/32338

Sample Failed Step: sync_integration_tests

Sample Flaky Test: SingleClientWalletWithAccountStorageSyncTest.DownloadAccountStorage_Card

Original change's description:
> sync_integration_tests: don't instantiate ScopedFeatureList in test body
> 
> 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: Ib1e0d87ed4ecc5ef33e9601ba84efecd399fb003
> Reviewed-on: https://chromium-review.googlesource.com/c/1402799
> Reviewed-by: Mikel Astiz <mastiz@chromium.org>
> Commit-Queue: Marc Treib <treib@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#621134}

Change-Id: Ic97b93a8c18d4db22ed92aaabb33074a0862c3ef
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 915219, 920216
Reviewed-on: https://chromium-review.googlesource.com/c/1403080
Cr-Commit-Position: refs/heads/master@{#621146}