Move some send stream configuration into webrtc::AudioSendStream.

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 6bccb43e56b8baaae2e20fa83bc0c7fe8acc447c..54a78ea17c36dc897284b483412e60f62c7d3133 100644
--- a/webrtc/call/bitrate_estimator_tests.cc
+++ b/webrtc/call/bitrate_estimator_tests.cc
@@ -118,13 +118,6 @@ class BitrateEstimatorTest : public test::CallTest {
   virtual ~BitrateEstimatorTest() { EXPECT_TRUE(streams_.empty()); }
 
   virtual void SetUp() {
-    EXPECT_CALL(mock_voice_engine_,
-        RegisterVoiceEngineObserver(testing::_)).WillOnce(testing::Return(0));
-    EXPECT_CALL(mock_voice_engine_,
-        DeRegisterVoiceEngineObserver()).WillOnce(testing::Return(0));
-    EXPECT_CALL(mock_voice_engine_, GetEventLog())
-        .WillRepeatedly(testing::Return(nullptr));
-
     AudioState::Config audio_state_config;
     audio_state_config.voice_engine = &mock_voice_engine_;
     Call::Config config;
@@ -265,7 +258,7 @@ class BitrateEstimatorTest : public test::CallTest {
     test::FakeDecoder fake_decoder_;
   };
 
-  test::MockVoiceEngine mock_voice_engine_;
+  testing::NiceMock<test::MockVoiceEngine> mock_voice_engine_;
   TraceObserver receiver_trace_;
   rtc::scoped_ptr<test::DirectTransport> send_transport_;
   rtc::scoped_ptr<test::DirectTransport> receive_transport_;