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

Unified Diff: content/test/ppapi/ppapi_test.cc

Issue 1153063002: Initialize AVFoundation explicitly (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix ppapi tests Created 5 years, 7 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/test/ppapi/ppapi_test.cc
diff --git a/content/test/ppapi/ppapi_test.cc b/content/test/ppapi/ppapi_test.cc
index 58da1249d597107fd072c5c561892b6647e71ed0..cebd6c4d0bf8c20bb4577b8ffe3b82e5c4b6f19f 100644
--- a/content/test/ppapi/ppapi_test.cc
+++ b/content/test/ppapi/ppapi_test.cc
@@ -19,6 +19,8 @@
#if defined(OS_CHROMEOS)
#include "chromeos/audio/cras_audio_handler.h"
+#elif defined(OS_MACOSX)
+#include "media/base/mac/avfoundation_glue.h"
#endif
namespace content {
@@ -122,6 +124,9 @@ void OutOfProcessPPAPITest::SetUp() {
#if defined(OS_CHROMEOS)
chromeos::CrasAudioHandler::InitializeForTesting();
#endif
+#if defined(OS_MACOSX)
+ AVFoundationGlue::InitializeAVFoundation();
jam 2015/05/26 23:13:47 if we had this line in ContentBrowserTest::Setup,
tommi (sloooow) - chröme 2015/05/27 09:11:02 Not sure, I'll investigate. I tried to limit the
+#endif
ContentBrowserTest::SetUp();
}

Powered by Google App Engine
This is Rietveld 408576698