Commit a0003b79 authored by Roman Sorokin's avatar Roman Sorokin Committed by Commit Bot

[Sheriff] Disable ResetMediaFeed_WebContentsDestroyed on lacros

TBR=beccahughes@chromium.org

Bug: 1124983
Change-Id: I1f56f52732b5ad24cd6ab11fb47970eabf19407e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2423709Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809268}
parent fcb624a2
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "base/task/post_task.h" #include "base/task/post_task.h"
#include "base/test/bind_test_util.h" #include "base/test/bind_test_util.h"
#include "base/test/scoped_feature_list.h" #include "base/test/scoped_feature_list.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/media/feeds/media_feeds_contents_observer.h" #include "chrome/browser/media/feeds/media_feeds_contents_observer.h"
#include "chrome/browser/media/feeds/media_feeds_service.h" #include "chrome/browser/media/feeds/media_feeds_service.h"
#include "chrome/browser/media/feeds/media_feeds_store.mojom-forward.h" #include "chrome/browser/media/feeds/media_feeds_store.mojom-forward.h"
...@@ -866,9 +867,8 @@ IN_PROC_BROWSER_TEST_F(MediaFeedsBrowserTest, ResetMediaFeed_OnNavigation) { ...@@ -866,9 +867,8 @@ IN_PROC_BROWSER_TEST_F(MediaFeedsBrowserTest, ResetMediaFeed_OnNavigation) {
} }
} }
// Flaky failures: crbug.com/1124983
IN_PROC_BROWSER_TEST_F(MediaFeedsBrowserTest, IN_PROC_BROWSER_TEST_F(MediaFeedsBrowserTest,
DISABLED_ResetMediaFeed_OnNavigation_NeverFetched) { ResetMediaFeed_OnNavigation_NeverFetched) {
DiscoverFeed(kMediaFeedsTestURL); DiscoverFeed(kMediaFeedsTestURL);
ui_test_utils::NavigateToURL( ui_test_utils::NavigateToURL(
...@@ -919,8 +919,16 @@ IN_PROC_BROWSER_TEST_F(MediaFeedsBrowserTest, ...@@ -919,8 +919,16 @@ IN_PROC_BROWSER_TEST_F(MediaFeedsBrowserTest,
} }
} }
// Flaky on lacros: crbug.com/1124983
#if BUILDFLAG(IS_LACROS)
#define MAYBE_ResetMediaFeed_WebContentsDestroyed \
DISABLED_ResetMediaFeed_WebContentsDestroyed
#else
#define MAYBE_ResetMediaFeed_WebContentsDestroyed \
ResetMediaFeed_WebContentsDestroyed
#endif
IN_PROC_BROWSER_TEST_F(MediaFeedsBrowserTest, IN_PROC_BROWSER_TEST_F(MediaFeedsBrowserTest,
ResetMediaFeed_WebContentsDestroyed) { MAYBE_ResetMediaFeed_WebContentsDestroyed) {
DiscoverFeed(kMediaFeedsTestURL); DiscoverFeed(kMediaFeedsTestURL);
{ {
......
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