Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(784)

Unified Diff: content/browser/media/media_browsertest.cc

Issue 512973002: Avoid deadlock between Pipeline and RendererImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reenable tests Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/media/media_browsertest.cc
diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc
index 1bc617c6db630b46021a04a7892605dd6deb3976..0ffc029d80e1030f4def70163c0da87eeed79aee 100644
--- a/content/browser/media/media_browsertest.cc
+++ b/content/browser/media/media_browsertest.cc
@@ -110,8 +110,6 @@ class MediaTest : public testing::WithParamInterface<bool>,
}
};
-// http://crbug.com/407452
-#if !defined(THREAD_SANITIZER)
IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearTheora) {
PlayVideo("bear.ogv", GetParam());
}
@@ -236,13 +234,10 @@ IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) {
NavigateToURL(shell(), GURL(url::kAboutBlankURL));
EXPECT_FALSE(shell()->web_contents()->IsCrashed());
}
-#endif // !defined(THREAD_SANITIZER)
INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false));
INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true));
-// http://crbug.com/407452
-#if !defined(THREAD_SANITIZER)
IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pTheora)) {
RunColorFormatTest("yuv420p.ogv", kEnded);
}
@@ -263,8 +258,6 @@ IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pVp9)) {
RunColorFormatTest("yuv444p.webm", "ENDED");
}
-#endif // !defined(THREAD_SANITIZER)
-
#if defined(USE_PROPRIETARY_CODECS)
IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pH264)) {
RunColorFormatTest("yuv420p.mp4", kEnded);
« no previous file with comments | « content/browser/media/encrypted_media_browsertest.cc ('k') | content/browser/media/media_source_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698