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

Unified Diff: chrome/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: chrome/test/ppapi/ppapi_test.cc
diff --git a/chrome/test/ppapi/ppapi_test.cc b/chrome/test/ppapi/ppapi_test.cc
index 48d758a9258a3fe0316f869b35b7d5478f5d315f..2f7ad89eb1fa47adbd9f34c6fd15e44f85c7b082 100644
--- a/chrome/test/ppapi/ppapi_test.cc
+++ b/chrome/test/ppapi/ppapi_test.cc
@@ -33,6 +33,10 @@
#include "ppapi/shared_impl/ppapi_switches.h"
#include "ui/gl/gl_switches.h"
+#if defined(OS_MACOSX)
+#include "media/base/mac/avfoundation_glue.h"
+#endif
+
using content::DomOperationNotificationDetails;
using content::RenderViewHost;
using content::TestMessageHandler;
@@ -141,6 +145,9 @@ void PPAPITestBase::SetUpCommandLine(base::CommandLine* command_line) {
}
void PPAPITestBase::SetUpOnMainThread() {
+#if defined(OS_MACOSX)
+ AVFoundationGlue::InitializeAVFoundation();
+#endif
// Always allow access to the PPAPI broker.
browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
CONTENT_SETTINGS_TYPE_PPAPI_BROKER, CONTENT_SETTING_ALLOW);

Powered by Google App Engine
This is Rietveld 408576698