Index: content/browser/site_per_process_browsertest.cc |
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc |
index e524b92191ea0c02790fa5c55778401971fb6dad..cb7a479d278c1781ffa6b7d373b786eb0e27a4cf 100644 |
--- a/content/browser/site_per_process_browsertest.cc |
+++ b/content/browser/site_per_process_browsertest.cc |
@@ -1090,13 +1090,9 @@ |
// Test that scrolling a nested out-of-process iframe bubbles unused scroll |
// delta to a parent frame. |
-#if defined(OS_ANDROID) |
-#define MAYBE_ScrollBubblingFromOOPIFTest DISABLED_ScrollBubblingFromOOPIFTest |
-#else |
-#define MAYBE_ScrollBubblingFromOOPIFTest ScrollBubblingFromOOPIFTest |
-#endif |
+// Flaky: https://crbug.com/627238 |
IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
- MAYBE_ScrollBubblingFromOOPIFTest) { |
+ DISABLED_ScrollBubblingFromOOPIFTest) { |
GURL main_url(embedded_test_server()->GetURL( |
"a.com", "/cross_site_iframe_factory.html?a(b)")); |
EXPECT_TRUE(NavigateToURL(shell(), main_url)); |
@@ -1164,10 +1160,6 @@ |
scroll_event.SetPositionInWidget(1, 1); |
scroll_event.delta_x = 0.0f; |
scroll_event.delta_y = -5.0f; |
- // Set has_precise_scroll_deltas to keep these events off the animated scroll |
- // pathways, which currently break this test. |
- // https://bugs.chromium.org/p/chromium/issues/detail?id=710513 |
- scroll_event.has_precise_scrolling_deltas = true; |
rwhv_parent->ProcessMouseWheelEvent(scroll_event, ui::LatencyInfo()); |
// Ensure that the view position is propagated to the child properly. |