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

Unified Diff: chrome/browser/media/encrypted_media_browsertest.cc

Issue 582233003: CDM FileIOTest: Work around flakiness by not closing during read/write. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | media/cdm/ppapi/cdm_file_io_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/encrypted_media_browsertest.cc
diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc
index 58602f9935f58bad4bb76a21f96714fe0f7275a3..29ffd36d7842acd9931a5afc78fa47b61a17211e 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -637,14 +637,7 @@ IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, DISABLED_CDMExpectedCrash) {
"plugin crash");
}
-// Disabled on Windows because this flakily causes failures in ~File, which
-// causes base::ThreadRestrictions::AssertIOAllowed problems. crbug.com/415742
-#if defined(OS_WIN)
-#define MAYBE_FileIOTest DISABLED_FileIOTest
-#else
-#define MAYBE_FileIOTest FileIOTest
-#endif
-IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, MAYBE_FileIOTest) {
+IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, FileIOTest) {
TestNonPlaybackCases(kExternalClearKeyFileIOTestKeySystem,
kFileIOTestSuccess);
}
« no previous file with comments | « no previous file | media/cdm/ppapi/cdm_file_io_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698