Commit 312ddf37 authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot

Remove redundant OS checks in SitePerProcessTextInputManagerTest.

OS_CHROMEOS already implies OS_LINUX.

Change-Id: I194767e151ec59134682db0a276e60f2ef9469ee
Reviewed-on: https://chromium-review.googlesource.com/820932Reviewed-by: default avatarEhsan Karamad <ekaramad@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523257}
parent 2a7fbdc5
...@@ -434,7 +434,7 @@ class SitePerProcessTextInputManagerTest : public InProcessBrowserTest { ...@@ -434,7 +434,7 @@ class SitePerProcessTextInputManagerTest : public InProcessBrowserTest {
// TextInputState.value reflects that of the focused input, i.e., the // TextInputState.value reflects that of the focused input, i.e., the
// TextInputManager is correctly tracking TextInputState across frames. // TextInputManager is correctly tracking TextInputState across frames.
// Flaky on chromeOS; https://crbug.com/704994. // Flaky on chromeOS; https://crbug.com/704994.
#if defined(OS_LINUX) && defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
#define MAYBE_TrackStateWhenSwitchingFocusedFrames \ #define MAYBE_TrackStateWhenSwitchingFocusedFrames \
DISABLED_TrackStateWhenSwitchingFocusedFrames DISABLED_TrackStateWhenSwitchingFocusedFrames
#else #else
...@@ -883,7 +883,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessTextInputManagerTest, ...@@ -883,7 +883,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessTextInputManagerTest,
// This test makes sure browser correctly tracks focused editable element inside // This test makes sure browser correctly tracks focused editable element inside
// each RenderFrameHost. // each RenderFrameHost.
// Test is flaky on chromeOS; https://crbug.com/705203. // Test is flaky on chromeOS; https://crbug.com/705203.
#if defined(OS_LINUX) && defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
#define MAYBE_TrackingFocusedElementForAllFrames \ #define MAYBE_TrackingFocusedElementForAllFrames \
DISABLED_TrackingFocusedElementForAllFrames DISABLED_TrackingFocusedElementForAllFrames
#else #else
...@@ -974,7 +974,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessTextInputManagerTest, ...@@ -974,7 +974,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessTextInputManagerTest,
// WebContents to clear focused element and verifies that there is no longer // WebContents to clear focused element and verifies that there is no longer
// a focused editable element on the page. // a focused editable element on the page.
// Test is flaky on ChromeOS; https://crbug.com/705203. // Test is flaky on ChromeOS; https://crbug.com/705203.
#if defined(OS_LINUX) && defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
#define MAYBE_ClearFocusedElementOnPage DISABLED_ClearFocusedElementOnPage #define MAYBE_ClearFocusedElementOnPage DISABLED_ClearFocusedElementOnPage
#else #else
#define MAYBE_ClearFocusedElementOnPage ClearFocusedElementOnPage #define MAYBE_ClearFocusedElementOnPage ClearFocusedElementOnPage
......
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