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

webrtc/call/bitrate_estimator_tests.cc

Index: webrtc/call/bitrate_estimator_tests.cc
diff --git a/webrtc/call/bitrate_estimator_tests.cc b/webrtc/call/bitrate_estimator_tests.cc
index 08e36c893a9b029be5b3cf7a27aac154be9a76c6..562b34075a147fb5410c8ac624e21d50c0c854a3 100644
--- a/webrtc/call/bitrate_estimator_tests.cc
+++ b/webrtc/call/bitrate_estimator_tests.cc
@@ -13,6 +13,7 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
+#include "webrtc/audio_state.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/thread_annotations.h"
@@ -131,8 +132,11 @@ class BitrateEstimatorTest : public test::CallTest {
   }
 
   virtual void SetUp() {
+    AudioState::Config audio_state_config;
+    audio_state_config.voice_engine = &fake_voice_engine_;
+    audio_state_.reset(AudioState::Create(audio_state_config));
     Call::Config config;
-    config.voice_engine = &fake_voice_engine_;
+    config.audio_state = audio_state_.get();
     receiver_call_.reset(Call::Create(config));
     sender_call_.reset(Call::Create(config));
 
@@ -171,6 +175,7 @@ class BitrateEstimatorTest : public test::CallTest {
     }
 
     receiver_call_.reset();
+    sender_call_.reset();
   }
 
  protected:
@@ -269,6 +274,7 @@ class BitrateEstimatorTest : public test::CallTest {
   };
 
   test::FakeVoiceEngine fake_voice_engine_;
+  rtc::scoped_ptr<AudioState> audio_state_;
   TraceObserver receiver_trace_;
   test::DirectTransport send_transport_;
   test::DirectTransport receive_transport_;