| Index: chrome/browser/media/media_stream_devices_controller.cc
|
| diff --git a/chrome/browser/media/media_stream_devices_controller.cc b/chrome/browser/media/media_stream_devices_controller.cc
|
| index 3b4e46149ddb10859cbaac0a30e028bbc49f775a..3dd7c1e717c470f678809d6dc662f1fc2b2c22c1 100644
|
| --- a/chrome/browser/media/media_stream_devices_controller.cc
|
| +++ b/chrome/browser/media/media_stream_devices_controller.cc
|
| @@ -23,6 +23,7 @@
|
| #include "chrome/common/pref_names.h"
|
| #include "components/user_prefs/pref_registry_syncable.h"
|
| #include "content/public/browser/browser_thread.h"
|
| +#include "content/public/browser/media_capture_devices.h"
|
| #include "content/public/common/media_stream_request.h"
|
| #include "extensions/common/constants.h"
|
| #include "grit/generated_resources.h"
|
| @@ -34,14 +35,14 @@
|
| #endif
|
|
|
| using content::BrowserThread;
|
| -
|
| +using content::MediaCaptureDevices;
|
| namespace {
|
|
|
| bool HasAnyAvailableDevice() {
|
| const content::MediaStreamDevices& audio_devices =
|
| - MediaCaptureDevicesDispatcher::GetInstance()->GetAudioCaptureDevices();
|
| + MediaCaptureDevices::GetInstance()->GetAudioCaptureDevices();
|
| const content::MediaStreamDevices& video_devices =
|
| - MediaCaptureDevicesDispatcher::GetInstance()->GetVideoCaptureDevices();
|
| + MediaCaptureDevices::GetInstance()->GetVideoCaptureDevices();
|
|
|
| return !audio_devices.empty() || !video_devices.empty();
|
| }
|
|
|