| Index: content/browser/media/media_internals.h
|
| diff --git a/content/browser/media/media_internals.h b/content/browser/media/media_internals.h
|
| index 77f4fb1bf09c594a60fedf0fa642ad90ac4b5cb3..15ce2197b35759895360edaf9d61ba87dc063275 100644
|
| --- a/content/browser/media/media_internals.h
|
| +++ b/content/browser/media/media_internals.h
|
| @@ -21,10 +21,10 @@
|
| #include "content/common/content_export.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| +#include "device/capture/video/video_capture_device_descriptor.h"
|
| #include "media/audio/audio_logging.h"
|
| #include "media/base/media_log.h"
|
| #include "media/base/video_capture_types.h"
|
| -#include "media/capture/video/video_capture_device_descriptor.h"
|
|
|
| namespace media {
|
| class AudioParameters;
|
| @@ -75,7 +75,7 @@ class CONTENT_EXPORT MediaInternals
|
|
|
| // Called to inform of the capabilities enumerated for video devices.
|
| void UpdateVideoCaptureDeviceCapabilities(
|
| - const std::vector<std::tuple<media::VideoCaptureDeviceDescriptor,
|
| + const std::vector<std::tuple<device::VideoCaptureDeviceDescriptor,
|
| media::VideoCaptureFormats>>&
|
| descriptors_and_formats);
|
|
|
|
|