From 48edc9224cfe53e1404fb21cb37ad7951bee18ef Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Wed, 5 Jun 2019 10:14:00 +0200 Subject: [PATCH] Delete deprecated AudioDeviceWithDataObserver factory Bug: webrtc:10284 Change-Id: I00ccba2c84e47f2b97bdd9c841467ccc0c6f900f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140281 Reviewed-by: Henrik Andreassson Commit-Queue: Danil Chapovalov Cr-Commit-Position: refs/heads/master@{#28162} --- modules/audio_device/audio_device_data_observer.cc | 8 -------- modules/audio_device/include/audio_device_data_observer.h | 7 ------- 2 files changed, 15 deletions(-) diff --git a/modules/audio_device/audio_device_data_observer.cc b/modules/audio_device/audio_device_data_observer.cc index 01f283fd97..877d8d96dd 100644 --- a/modules/audio_device/audio_device_data_observer.cc +++ b/modules/audio_device/audio_device_data_observer.cc @@ -10,7 +10,6 @@ #include "modules/audio_device/include/audio_device_data_observer.h" -#include "api/task_queue/global_task_queue_factory.h" #include "modules/audio_device/include/audio_device_defines.h" #include "rtc_base/checks.h" #include "rtc_base/ref_counted_object.h" @@ -281,13 +280,6 @@ class ADMWrapper : public AudioDeviceModule, public AudioTransport { } // namespace -rtc::scoped_refptr CreateAudioDeviceWithDataObserver( - const AudioDeviceModule::AudioLayer audio_layer, - AudioDeviceDataObserver* observer) { - return CreateAudioDeviceWithDataObserver(audio_layer, - &GlobalTaskQueueFactory(), observer); -} - rtc::scoped_refptr CreateAudioDeviceWithDataObserver( AudioDeviceModule::AudioLayer audio_layer, TaskQueueFactory* task_queue_factory, diff --git a/modules/audio_device/include/audio_device_data_observer.h b/modules/audio_device/include/audio_device_data_observer.h index 19b20ded0c..14958ea577 100644 --- a/modules/audio_device/include/audio_device_data_observer.h +++ b/modules/audio_device/include/audio_device_data_observer.h @@ -17,7 +17,6 @@ #include "api/scoped_refptr.h" #include "api/task_queue/task_queue_factory.h" #include "modules/audio_device/include/audio_device.h" -#include "rtc_base/deprecation.h" namespace webrtc { @@ -41,12 +40,6 @@ class AudioDeviceDataObserver { virtual ~AudioDeviceDataObserver() = default; }; -// TODO(bugs.webrtc.org/10284): Remove when unused. -RTC_DEPRECATED -rtc::scoped_refptr CreateAudioDeviceWithDataObserver( - const AudioDeviceModule::AudioLayer audio_layer, - AudioDeviceDataObserver* observer); - // Creates an ADM instance with AudioDeviceDataObserver registered. rtc::scoped_refptr CreateAudioDeviceWithDataObserver( const AudioDeviceModule::AudioLayer audio_layer,