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

Unified Diff: media/video/capture/video_capture_device_unittest.cc

Issue 1153063002: Initialize AVFoundation explicitly (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add perf trace for InitializeAVFoundation and revert changes in browser_test_base.cc 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
« no previous file with comments | « media/video/capture/mac/video_capture_device_factory_mac_unittest.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/video/capture/video_capture_device_unittest.cc
diff --git a/media/video/capture/video_capture_device_unittest.cc b/media/video/capture/video_capture_device_unittest.cc
index 8968fb375e88f7d944e9a312510bedad3374f799..3ae4ef5c07d9e9bdaf2eb9e006e98a8ac5e5b9b3 100644
--- a/media/video/capture/video_capture_device_unittest.cc
+++ b/media/video/capture/video_capture_device_unittest.cc
@@ -23,6 +23,7 @@
#endif
#if defined(OS_MACOSX)
+#include "media/base/mac/avfoundation_glue.h"
#include "media/video/capture/mac/video_capture_device_factory_mac.h"
#endif
@@ -58,7 +59,6 @@ using ::testing::_;
using ::testing::SaveArg;
namespace media {
-
namespace {
static const gfx::Size kCaptureSizes[] = {
@@ -156,6 +156,9 @@ class VideoCaptureDeviceTest :
VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice(
base::android::AttachCurrentThread());
#endif
+#if defined(OS_MACOSX)
+ AVFoundationGlue::InitializeAVFoundation();
+#endif
EXPECT_CALL(*client_, OnIncomingCapturedYuvData(_,_,_,_,_,_,_,_,_))
.Times(0);
EXPECT_CALL(*client_, DoReserveOutputBuffer()).Times(0);
« no previous file with comments | « media/video/capture/mac/video_capture_device_factory_mac_unittest.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698