Pass ownership of external encoders to the ACM

webrtc/modules/audio_coding/acm2/codec_manager_unittest.cc

 /*
  *  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 19 matching lines @@
   EXPECT_CALL(*enc, Max10MsFramesInAPacket()).WillRepeatedly(Return(1));
   EXPECT_CALL(*enc, Die());
   return enc;
 }
 
 }  // namespace
 
 TEST(CodecManagerTest, ExternalEncoderFec) {
   auto enc0 = CreateMockEncoder();
   auto enc1 = CreateMockEncoder();
+  auto enc2 = CreateMockEncoder();
   {
     ::testing::InSequence s;
     EXPECT_CALL(*enc0, SetFec(false)).WillOnce(Return(true));
-    EXPECT_CALL(*enc0, Mark("A"));
-    EXPECT_CALL(*enc0, SetFec(true)).WillOnce(Return(true));
     EXPECT_CALL(*enc1, SetFec(true)).WillOnce(Return(true));
-    EXPECT_CALL(*enc1, SetFec(false)).WillOnce(Return(true));
-    EXPECT_CALL(*enc0, Mark("B"));
-    EXPECT_CALL(*enc0, SetFec(false)).WillOnce(Return(true));
+    EXPECT_CALL(*enc2, SetFec(true)).WillOnce(Return(false));
   }
 
   CodecManager cm;
   RentACodec rac;
+
+  // use_codec_fec starts out false.
   EXPECT_FALSE(cm.GetStackParams()->use_codec_fec);
-  cm.GetStackParams()->speech_encoder = enc0.get();
+  cm.GetStackParams()->speech_encoder = std::move(enc0);
   EXPECT_TRUE(rac.RentEncoderStack(cm.GetStackParams()));
   EXPECT_FALSE(cm.GetStackParams()->use_codec_fec);
-  enc0->Mark("A");
+
+  // Set it to true.
   EXPECT_EQ(true, cm.SetCodecFEC(true));
-  EXPECT_TRUE(rac.RentEncoderStack(cm.GetStackParams()));
   EXPECT_TRUE(cm.GetStackParams()->use_codec_fec);
-  cm.GetStackParams()->speech_encoder = enc1.get();
+  cm.GetStackParams()->speech_encoder = std::move(enc1);
   EXPECT_TRUE(rac.RentEncoderStack(cm.GetStackParams()));
   EXPECT_TRUE(cm.GetStackParams()->use_codec_fec);
 
-  EXPECT_EQ(true, cm.SetCodecFEC(false));
-  EXPECT_TRUE(rac.RentEncoderStack(cm.GetStackParams()));
-  enc0->Mark("B");
-  EXPECT_FALSE(cm.GetStackParams()->use_codec_fec);
-  cm.GetStackParams()->speech_encoder = enc0.get();
+  // Switch to a codec that doesn't support it.
+  cm.GetStackParams()->speech_encoder = std::move(enc2);
   EXPECT_TRUE(rac.RentEncoderStack(cm.GetStackParams()));
   EXPECT_FALSE(cm.GetStackParams()->use_codec_fec);
 }
 
 }  // namespace acm2
 }  // namespace webrtc