| Index: content/browser/media/media_internals.cc
|
| diff --git a/content/browser/media/media_internals.cc b/content/browser/media/media_internals.cc
|
| index 3ef867386b38ba2c1d3df7d8e3b1e29f5092261b..80b1ebdc55d1d622d8a749c2db568bd558bf1090 100644
|
| --- a/content/browser/media/media_internals.cc
|
| +++ b/content/browser/media/media_internals.cc
|
| @@ -600,7 +600,7 @@ void MediaInternals::SendVideoCaptureDeviceCapabilities() {
|
| }
|
|
|
| void MediaInternals::UpdateVideoCaptureDeviceCapabilities(
|
| - const std::vector<std::tuple<media::VideoCaptureDeviceDescriptor,
|
| + const std::vector<std::tuple<device::VideoCaptureDeviceDescriptor,
|
| media::VideoCaptureFormats>>&
|
| descriptors_and_formats) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| @@ -612,7 +612,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilities(
|
| // parsed by the javascript handler, is brittle. Consider passing
|
| // a list of mappings instead.
|
|
|
| - const media::VideoCaptureDeviceDescriptor& descriptor =
|
| + const device::VideoCaptureDeviceDescriptor& descriptor =
|
| std::get<0>(device_format_pair);
|
| const media::VideoCaptureFormats& supported_formats =
|
| std::get<1>(device_format_pair);
|
|
|