Move VoiceEngineObserver into AudioSendStream so that we detect typing noises and return properly i…

webrtc/audio/audio_send_stream.h

Index: webrtc/audio/audio_send_stream.h
diff --git a/webrtc/audio/audio_send_stream.h b/webrtc/audio/audio_send_stream.h
index ae81dfc8fca82c12fb258702e3411f870161c163..f579e3e50a0c34cab982819a47308997030841fd 100644
--- a/webrtc/audio/audio_send_stream.h
+++ b/webrtc/audio/audio_send_stream.h
@@ -12,9 +12,8 @@
 #define WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_
 
 #include "webrtc/audio_send_stream.h"
-#include "webrtc/audio/scoped_voe_interface.h"
+#include "webrtc/audio/voice_engines.h"
 #include "webrtc/base/thread_checker.h"
-#include "webrtc/voice_engine/include/voe_base.h"
 
 namespace webrtc {
 
@@ -43,8 +42,8 @@ class AudioSendStream final : public webrtc::AudioSendStream {
   rtc::ThreadChecker thread_checker_;
   const webrtc::AudioSendStream::Config config_;
   VoiceEngine* voice_engine_;
-  // We hold one interface pointer to the VoE to make sure it is kept alive.
-  ScopedVoEInterface<VoEBase> voe_base_;
+
+  static VoiceEngines gVoiceEngines;
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioSendStream);
 };