Remove usage of VoEBase::AssociateSendChannel() from WVoMC.

webrtc/test/mock_voice_engine.h

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 18 matching lines @@
   // warnings from -Winconsistent-missing-override. See
   // http://crbug.com/428099.
   MockVoiceEngine(
       rtc::scoped_refptr<AudioDecoderFactory> decoder_factory = nullptr)
       : decoder_factory_(decoder_factory) {
     // Increase ref count so this object isn't automatically deleted whenever
     // interfaces are Release():d.
     ++_ref_count;
     // We add this default behavior to make the mock easier to use in tests. It
     // will create a NiceMock of a voe::ChannelProxy.
-    // TODO(ossu): As long as AudioReceiveStream is implmented as a wrapper
+    // TODO(ossu): As long as AudioReceiveStream is implemented as a wrapper
     // around Channel, we need to make sure ChannelProxy returns the same
     // decoder factory as the one passed in when creating an AudioReceiveStream.
     ON_CALL(*this, ChannelProxyFactory(testing::_))
         .WillByDefault(testing::Invoke([this](int channel_id) {
           auto* proxy =
               new testing::NiceMock<webrtc::test::MockVoEChannelProxy>();
           EXPECT_CALL(*proxy, GetAudioDecoderFactory())
               .WillRepeatedly(testing::ReturnRef(decoder_factory_));
           return proxy;
         }));
   }
-  ~MockVoiceEngine() /* override */ {
+  virtual ~MockVoiceEngine() /* override */ {
     // Decrease ref count before base class d-tor is called; otherwise it will
     // trigger an assertion.
     --_ref_count;
   }
   // Allows injecting a ChannelProxy factory.
   MOCK_METHOD1(ChannelProxyFactory, voe::ChannelProxy*(int channel_id));
 
   // VoiceEngineImpl
-  std::unique_ptr<voe::ChannelProxy> GetChannelProxy(
+  virtual std::unique_ptr<voe::ChannelProxy> GetChannelProxy(
       int channel_id) /* override */ {
     return std::unique_ptr<voe::ChannelProxy>(ChannelProxyFactory(channel_id));
   }
 
   // VoEAudioProcessing
   MOCK_METHOD2(SetNsStatus, int(bool enable, NsModes mode));
   MOCK_METHOD2(GetNsStatus, int(bool& enabled, NsModes& mode));
   MOCK_METHOD2(SetAgcStatus, int(bool enable, AgcModes mode));
   MOCK_METHOD2(GetAgcStatus, int(bool& enabled, AgcModes& mode));
   MOCK_METHOD1(SetAgcConfig, int(AgcConfig config));
@@ skipping 257 matching lines @@
   // functor implementing the default version of ChannelProxyFactory, above.
   // GMock creates an unfortunate copy of the functor, which would cause us to
   // return a dangling reference. Fortunately, this should go away once
   // voe::Channel does.
   rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
 };
 }  // namespace test
 }  // namespace webrtc
 
 #endif  // WEBRTC_AUDIO_MOCK_VOICE_ENGINE_H_