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

talk/media/base/mediaengine.h

Index: talk/media/base/mediaengine.h
diff --git a/talk/media/base/mediaengine.h b/talk/media/base/mediaengine.h
index 1a992d7d4a7700470a71ca53f6b5601241a569e1..78fe1606eb7f75ecacacbc07170ae1e6741f1cb4 100644
--- a/talk/media/base/mediaengine.h
+++ b/talk/media/base/mediaengine.h
@@ -50,8 +50,8 @@
 #endif
 
 namespace webrtc {
+class AudioState;
 class Call;
-class VoiceEngine;
 }
 
 namespace cricket {
@@ -72,7 +72,7 @@ class MediaEngineInterface {
   // Shuts down the engine.
   virtual void Terminate() = 0;
   // TODO(solenberg): Remove once VoE API refactoring is done.
-  virtual webrtc::VoiceEngine* GetVoE() = 0;
+  virtual webrtc::AudioState* GetAudioState() = 0;
 
   // MediaChannel creation
   // Creates a voice media channel. Returns NULL on failure.
@@ -167,8 +167,8 @@ class CompositeMediaEngine : public MediaEngineInterface {
     voice_.Terminate();
   }
 
-  virtual webrtc::VoiceEngine* GetVoE() {
-    return voice_.GetVoE();
+  virtual webrtc::AudioState* GetAudioState() {
+    return voice_.GetAudioState();
   }
   virtual VoiceMediaChannel* CreateChannel(webrtc::Call* call,
                                            const AudioOptions& options) {