GitLab

This reverts commit 6111392d.

Refactoring did do something, but the issue remained.  The core problem
I think is that the parent class fields are initialized first.  This
means the parent class's fields like content::TestBrowserThreadBundle
get created, which I think will end up looking at field trial state.
Adding a base::test::ScopedFeatureList after that happens is too late;
the initial field trial state has already been inspected.

I could create a separate class that lists the base::test::ScopedFeatureList
first, and then all the other variables such as TestBrowserThreadBundle
later.  That might work.  Or not; I think there are other reasons the
TestBrowserThreadBundle wants to be listed first in the fields of a testing
class.

It's not worth the trouble to investigate.  I'm happy to have coverage
of the single MAYBE_ test on regular bot.  I don't think we also need
coverage of it on the ASAN (THREAD_SANITIZER) bots as well.

Bug: 891959
Change-Id: Iae816dde484982060121c3e667b779d70da00e65
Reviewed-on: https://chromium-review.googlesource.com/c/1334269Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Commit-Queue: Mark Pearson <mpearson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607776}