| 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 fc10f370ceebdac39c3dc2539a13ea8ce1957b09..5d83c9bb9dd6504b0a94c5712ad60a3332892c73 100644
|
| --- a/content/browser/media/media_internals_unittest.cc
|
| +++ b/content/browser/media/media_internals_unittest.cc
|
| @@ -109,7 +109,7 @@ class MediaInternalsVideoCaptureDeviceTest : public testing::Test,
|
| MediaInternals::UpdateCallback update_cb_;
|
| };
|
|
|
| -#if defined(OS_WIN) || defined(OS_MACOSX)
|
| +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID)
|
| TEST_F(MediaInternalsVideoCaptureDeviceTest,
|
| AllCaptureApiTypesHaveProperStringRepresentation) {
|
| typedef media::VideoCaptureDevice::Name VideoCaptureDeviceName;
|
| @@ -125,6 +125,12 @@ TEST_F(MediaInternalsVideoCaptureDeviceTest,
|
| m[VideoCaptureDeviceName::AVFOUNDATION] = "AV Foundation";
|
| m[VideoCaptureDeviceName::QTKIT] = "QTKit";
|
| m[VideoCaptureDeviceName::DECKLINK] = "DeckLink";
|
| +#elif defined(OS_ANDROID)
|
| + m[VideoCaptureDeviceName::API1] = "API1";
|
| + m[VideoCaptureDeviceName::API2_LEGACY] = "API2_LEGACY";
|
| + m[VideoCaptureDeviceName::API2_FULL] = "API2_FULL";
|
| + m[VideoCaptureDeviceName::API2_LIMITED] = "API2_LIMITED";
|
| + m[VideoCaptureDeviceName::TANGO] = "TANGO";
|
| #endif
|
| EXPECT_EQ(media::VideoCaptureDevice::Name::API_TYPE_UNKNOWN, m.size());
|
| for (CaptureApiTypeStringMap::iterator it = m.begin(); it != m.end(); ++it) {
|
| @@ -172,6 +178,9 @@ TEST_F(MediaInternalsVideoCaptureDeviceTest,
|
| #elif defined(OS_WIN)
|
| media::VideoCaptureDevice::Name("dummy", "dummy",
|
| media::VideoCaptureDevice::Name::DIRECT_SHOW),
|
| +#elif defined(OS_ANDROID)
|
| + media::VideoCaptureDevice::Name("dummy", "dummy",
|
| + media::VideoCaptureDevice::Name::API2_LEGACY),
|
| #elif defined(OS_LINUX) || defined(OS_CHROMEOS)
|
| media::VideoCaptureDevice::Name("dummy", "/dev/dummy"),
|
| #else
|
| @@ -200,6 +209,8 @@ TEST_F(MediaInternalsVideoCaptureDeviceTest,
|
| ExpectString("captureApi", "QTKit");
|
| #elif defined(OS_WIN)
|
| ExpectString("captureApi", "Direct Show");
|
| +#elif defined(OS_ANDROID)
|
| + ExpectString("captureApi", "API2_LEGACY");
|
| #endif
|
| }
|
|
|
|
|