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

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

Issue 1815983003: Remove deprecated QTKit Video Capture Support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 9 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 | « content/browser/BUILD.gn ('k') | content/browser/renderer_host/media/video_capture_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/media_internals_unittest.cc
diff --git a/content/browser/media/media_internals_unittest.cc b/content/browser/media/media_internals_unittest.cc
index 33d0cb8d32aa148bb5ee760c0b69d12d9563fcbe..754eb4bddfeb01ff246ff3be90193db35cf18c45 100644
--- a/content/browser/media/media_internals_unittest.cc
+++ b/content/browser/media/media_internals_unittest.cc
@@ -127,7 +127,6 @@ TEST_F(MediaInternalsVideoCaptureDeviceTest,
m[VideoCaptureDeviceName::DIRECT_SHOW] = "Direct Show";
#elif defined(OS_MACOSX)
m[VideoCaptureDeviceName::AVFOUNDATION] = "AV Foundation";
- m[VideoCaptureDeviceName::QTKIT] = "QTKit";
m[VideoCaptureDeviceName::DECKLINK] = "DeckLink";
#elif defined(OS_ANDROID)
m[VideoCaptureDeviceName::API1] = "Camera API1";
@@ -180,8 +179,8 @@ TEST_F(MediaInternalsVideoCaptureDeviceTest,
formats.push_back(format_hd);
const media::VideoCaptureDeviceInfo device_info(
#if defined(OS_MACOSX)
- media::VideoCaptureDevice::Name("dummy", "dummy",
- media::VideoCaptureDevice::Name::QTKIT),
+ media::VideoCaptureDevice::Name(
+ "dummy", "dummy", media::VideoCaptureDevice::Name::AVFOUNDATION),
#elif defined(OS_WIN)
media::VideoCaptureDevice::Name("dummy", "dummy",
media::VideoCaptureDevice::Name::DIRECT_SHOW),
@@ -219,7 +218,7 @@ TEST_F(MediaInternalsVideoCaptureDeviceTest,
#elif defined(OS_WIN)
ExpectString("captureApi", "Direct Show");
#elif defined(OS_MACOSX)
- ExpectString("captureApi", "QTKit");
+ ExpectString("captureApi", "AV Foundation");
#elif defined(OS_ANDROID)
ExpectString("captureApi", "Camera API2 Legacy");
#endif
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/renderer_host/media/video_capture_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698