Commit da9c32f9 authored by Emily Stark's avatar Emily Stark Committed by Commit Bot

OmniboxViewViews tests: pull out ScopedFeatureList into text fixture class

ScopedFeatureLists are supposed to be initialized in text fixture
constructors to avoid data races.

Bug: 1095832
Change-Id: Ifd4a290cd4cf49421df99c5c0338e0fa8633d2f7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2250084
Commit-Queue: Emily Stark <estark@chromium.org>
Reviewed-by: default avatarTommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#779980}
parent 8506d3da
...@@ -173,17 +173,21 @@ class OmniboxViewViews : public OmniboxView, ...@@ -173,17 +173,21 @@ class OmniboxViewViews : public OmniboxView,
bool IsDropCursorForInsertion() const override; bool IsDropCursorForInsertion() const override;
private: private:
FRIEND_TEST_ALL_PREFIXES(OmniboxViewViewsTest, RevealOnHover); FRIEND_TEST_ALL_PREFIXES(OmniboxViewViewsRevealOnHoverTest, HoverAndExit);
FRIEND_TEST_ALL_PREFIXES(OmniboxViewViewsTest, FRIEND_TEST_ALL_PREFIXES(
HideOnInteractionAndRevealOnHover); OmniboxViewViewsHideOnInteractionAndRevealOnHoverTest,
FRIEND_TEST_ALL_PREFIXES(OmniboxViewViewsTest, UserInteractionAndHover);
HideOnInteractionAfterFocusAndBlur); FRIEND_TEST_ALL_PREFIXES(
FRIEND_TEST_ALL_PREFIXES(OmniboxViewViewsTest, RevealOnHoverAfterBlur); OmniboxViewViewsHideOnInteractionAndRevealOnHoverTest,
FRIEND_TEST_ALL_PREFIXES(OmniboxViewViewsTest, PathChangeDuringAnimation); HideOnInteractionAfterFocusAndBlur);
FRIEND_TEST_ALL_PREFIXES(OmniboxViewViewsTest, FRIEND_TEST_ALL_PREFIXES(OmniboxViewViewsRevealOnHoverTest, AfterBlur);
HideOnInteractionSameDocNavigations); FRIEND_TEST_ALL_PREFIXES(
FRIEND_TEST_ALL_PREFIXES(OmniboxViewViewsTest, OmniboxViewViewsHideOnInteractionAndRevealOnHoverTest,
HideOnInteractionSubframeNavigations); PathChangeDuringAnimation);
FRIEND_TEST_ALL_PREFIXES(OmniboxViewViewsHideOnInteractionTest,
SameDocNavigations);
FRIEND_TEST_ALL_PREFIXES(OmniboxViewViewsHideOnInteractionTest,
SubframeNavigations);
// TODO(tommycli): Remove the rest of these friends after porting these // TODO(tommycli): Remove the rest of these friends after porting these
// browser tests to unit tests. // browser tests to unit tests.
FRIEND_TEST_ALL_PREFIXES(OmniboxViewViewsTest, CloseOmniboxPopupOnTextDrag); FRIEND_TEST_ALL_PREFIXES(OmniboxViewViewsTest, CloseOmniboxPopupOnTextDrag);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment