Switch to using new ACM methods for encoder management

webrtc/modules/audio_coding/acm2/rent_a_codec_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 204 matching lines @@
   TestCngAndRedResetSpeechEncoder(false, false);
 }
 
 TEST(RentACodecTest, RentEncoderError) {
   const CodecInst codec_inst = {
       0, "Robert'); DROP TABLE Students;", 8000, 160, 1, 64000};
   RentACodec rent_a_codec;
   EXPECT_FALSE(rent_a_codec.RentEncoder(codec_inst));
 }
 
-#if GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 TEST(RentACodecTest, RentEncoderStackWithoutSpeechEncoder) {
   RentACodec::StackParameters sp;
   EXPECT_EQ(nullptr, sp.speech_encoder);
-  EXPECT_DEATH(RentACodec().RentEncoderStack(&sp), "");
+  EXPECT_EQ(nullptr, RentACodec().RentEncoderStack(&sp));
 }
-#endif
 
 }  // namespace acm2
 }  // namespace webrtc