| Index: content/browser/renderer_host/media/audio_input_device_manager.h
|
| diff --git a/content/browser/renderer_host/media/audio_input_device_manager.h b/content/browser/renderer_host/media/audio_input_device_manager.h
|
| index 0f58242f75d2f758ab24e9986599ea52276daae5..fb034b0325678ec24a3302fac311025e1d8b5fb6 100644
|
| --- a/content/browser/renderer_host/media/audio_input_device_manager.h
|
| +++ b/content/browser/renderer_host/media/audio_input_device_manager.h
|
| @@ -14,6 +14,7 @@
|
| #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_INPUT_DEVICE_MANAGER_H_
|
|
|
| #include <map>
|
| +#include <vector>
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| @@ -23,7 +24,6 @@
|
| #include "content/common/content_export.h"
|
| #include "content/common/media/media_stream_options.h"
|
| #include "content/public/common/media_stream_request.h"
|
| -#include "media/audio/audio_device_name.h"
|
|
|
| namespace media {
|
| class AudioManager;
|
| @@ -51,13 +51,9 @@ class CONTENT_EXPORT AudioInputDeviceManager : public MediaStreamProvider {
|
| void Register(MediaStreamProviderListener* listener,
|
| const scoped_refptr<base::SingleThreadTaskRunner>&
|
| device_task_runner) override;
|
| - void EnumerateDevices(MediaStreamType stream_type) override;
|
| int Open(const StreamDeviceInfo& device) override;
|
| void Close(int session_id) override;
|
|
|
| - void UseFakeDevice();
|
| - bool ShouldUseFakeDevice() const;
|
| -
|
| #if defined(OS_CHROMEOS)
|
| // Registers and unregisters that a stream using keyboard mic has been opened
|
| // or closed. Keeps count of how many such streams are open and activates and
|
| @@ -70,23 +66,12 @@ class CONTENT_EXPORT AudioInputDeviceManager : public MediaStreamProvider {
|
| #endif
|
|
|
| private:
|
| - // Used by the unittests to get a list of fake devices.
|
| - friend class MediaStreamDispatcherHostTest;
|
| - void GetFakeDeviceNames(media::AudioDeviceNames* device_names);
|
| -
|
| typedef std::vector<StreamDeviceInfo> StreamDeviceList;
|
| ~AudioInputDeviceManager() override;
|
|
|
| - // Enumerates audio input devices on media stream device thread.
|
| - void EnumerateOnDeviceThread(MediaStreamType stream_type);
|
| // Opens the device on media stream device thread.
|
| void OpenOnDeviceThread(int session_id, const StreamDeviceInfo& info);
|
|
|
| - // Callback used by EnumerateOnDeviceThread(), called with a list of
|
| - // enumerated devices on IO thread.
|
| - void DevicesEnumeratedOnIOThread(
|
| - MediaStreamType stream_type,
|
| - std::unique_ptr<StreamDeviceInfoArray> devices);
|
| // Callback used by OpenOnDeviceThread(), called with the session_id
|
| // referencing the opened device on IO thread.
|
| void OpenedOnIOThread(int session_id, const StreamDeviceInfo& info);
|
| @@ -109,7 +94,6 @@ class CONTENT_EXPORT AudioInputDeviceManager : public MediaStreamProvider {
|
| // Only accessed on Browser::IO thread.
|
| MediaStreamProviderListener* listener_;
|
| int next_capture_session_id_;
|
| - bool use_fake_device_;
|
| StreamDeviceList devices_;
|
|
|
| #if defined(OS_CHROMEOS)
|
|
|