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 6a060176fb6ab32eae26f65c00b1bdcfe424b41c..fc10f370ceebdac39c3dc2539a13ea8ce1957b09 100644 |
--- a/content/browser/media/media_internals_unittest.cc |
+++ b/content/browser/media/media_internals_unittest.cc |
@@ -109,17 +109,14 @@ |
MediaInternals::UpdateCallback update_cb_; |
}; |
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) |
+#if defined(OS_WIN) || defined(OS_MACOSX) |
TEST_F(MediaInternalsVideoCaptureDeviceTest, |
AllCaptureApiTypesHaveProperStringRepresentation) { |
typedef media::VideoCaptureDevice::Name VideoCaptureDeviceName; |
typedef std::map<VideoCaptureDeviceName::CaptureApiType, std::string> |
CaptureApiTypeStringMap; |
CaptureApiTypeStringMap m; |
-#if defined(OS_LINUX) |
- m[VideoCaptureDeviceName::V4L2_SINGLE_PLANE] = "V4L2 SPLANE"; |
- m[VideoCaptureDeviceName::V4L2_MULTI_PLANE] = "V4L2 MPLANE"; |
-#elif defined(OS_WIN) |
+#if defined(OS_WIN) |
m[VideoCaptureDeviceName::MEDIA_FOUNDATION] = "Media Foundation"; |
m[VideoCaptureDeviceName::DIRECT_SHOW] = "Direct Show"; |
m[VideoCaptureDeviceName::DIRECT_SHOW_WDM_CROSSBAR] = |
@@ -175,10 +172,8 @@ |
#elif defined(OS_WIN) |
media::VideoCaptureDevice::Name("dummy", "dummy", |
media::VideoCaptureDevice::Name::DIRECT_SHOW), |
-#elif defined(OS_LINUX) |
- media::VideoCaptureDevice::Name( |
- "dummy", "/dev/dummy", |
- media::VideoCaptureDevice::Name::V4L2_SINGLE_PLANE), |
+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) |
+ media::VideoCaptureDevice::Name("dummy", "/dev/dummy"), |
#else |
media::VideoCaptureDevice::Name("dummy", "dummy"), |
#endif |
@@ -192,7 +187,7 @@ |
// exactly one device_info in the |device_infos|. |
media_internals_->UpdateVideoCaptureDeviceCapabilities(device_infos); |
-#if defined(OS_LINUX) |
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) |
ExpectString("id", "/dev/dummy"); |
#else |
ExpectString("id", "dummy"); |
@@ -201,12 +196,10 @@ |
base::ListValue expected_list; |
expected_list.AppendString(format_hd.ToString()); |
ExpectListOfStrings("formats", expected_list); |
-#if defined(OS_LINUX) |
- ExpectString("captureApi", "V4L2 SPLANE"); |
+#if defined(OS_MACOSX) |
+ ExpectString("captureApi", "QTKit"); |
#elif defined(OS_WIN) |
ExpectString("captureApi", "Direct Show"); |
-#elif defined(OS_MACOSX) |
- ExpectString("captureApi", "QTKit"); |
#endif |
} |