Fixed the offending test that caused this cl to be reverted in the 1st place:
ZeroStatePromoPageHandlerTest was not explicitly stating which variant of the IPH is being used in the test, and it seems that makes the test behave indeterministically, with different platforms using different variants.
The fix is to explicitly set the variant. Ironically, the test is not testing any variant-specific behavior.
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. | 
    base::test::ScopedFeatureList feature_list_;You will need to use a `ScopedIPHFeatureList` or inherit from `InteractiveFeaturePromoTest`. You cannot enable IPH features via a vanilla ScopedFeatureList.
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. | 
You will need to use a `ScopedIPHFeatureList` or inherit from `InteractiveFeaturePromoTest`. You cannot enable IPH features via a vanilla ScopedFeatureList.
Thanks for pointing this out! Strangely, the original code using just a ScopedFeatureList also worked locally on my cloudtop - and I tried with different variants to make sure it wasn't due to non-deterministic behavior of the feature flag.
Switched to ScopedIPHFeatureList.
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. | 
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. | 
| Inspect html for hidden footers to help with email filtering. To unsubscribe visit settings. |