Injectable audio encoders: voice_engine/channel changes.

webrtc/test/mock_voe_channel_proxy.h

Index: webrtc/test/mock_voe_channel_proxy.h
diff --git a/webrtc/test/mock_voe_channel_proxy.h b/webrtc/test/mock_voe_channel_proxy.h
index 7932473dd3a4f225c9361e4a61cc7dd6bbbc4475..8b64f2abb30d9a0fd94dfdc422008a0949f6743c 100644
--- a/webrtc/test/mock_voe_channel_proxy.h
+++ b/webrtc/test/mock_voe_channel_proxy.h
@@ -21,6 +21,14 @@ namespace test {
 
 class MockVoEChannelProxy : public voe::ChannelProxy {
  public:
+  // GTest doesn't like move-only types, like std::unique_ptr
+  bool SetEncoder(int payload_type,
+                  std::unique_ptr<AudioEncoder> encoder) {
+    return SetEncoderForMock(payload_type, &encoder);
+  }
+  MOCK_METHOD2(SetEncoderForMock,
+               bool(int payload_type,
+                    std::unique_ptr<AudioEncoder>* encoder));
   MOCK_METHOD1(SetRTCPStatus, void(bool enable));
   MOCK_METHOD1(SetLocalSSRC, void(uint32_t ssrc));
   MOCK_METHOD1(SetRTCP_CNAME, void(const std::string& c_name));