Renamed new EncodeInternal to EncodeImpl to ensure proper backwards compatibility.

webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h

 /*
  *  Copyright (c) 2014 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 25 matching lines @@
   MOCK_METHOD1(SetApplication, bool(Application application));
   MOCK_METHOD1(SetMaxPlaybackRate, void(int frequency_hz));
   MOCK_METHOD1(SetProjectedPacketLossRate, void(double fraction));
   MOCK_METHOD1(SetTargetBitrate, void(int target_bps));
   MOCK_METHOD1(SetMaxBitrate, void(int max_bps));
   MOCK_METHOD1(SetMaxPayloadSize, void(int max_payload_size_bytes));
 };
 
 class MockAudioEncoder final : public MockAudioEncoderBase {
  public:
-  using AudioEncoder::EncodeInternal;
-
   // Note, we explicitly chose not to create a mock for the Encode method.
-  MOCK_METHOD3(EncodeInternal,
+  MOCK_METHOD3(EncodeImpl,
                EncodedInfo(uint32_t timestamp,
                            rtc::ArrayView<const int16_t> audio,
                            rtc::Buffer* encoded));
 
   class FakeEncoding {
    public:
     // Creates a functor that will return |info| and adjust the rtc::Buffer
     // given as input to it, so it is info.encoded_bytes larger.
     FakeEncoding(const AudioEncoder::EncodedInfo& info);
 
@@ skipping 29 matching lines @@
                                          rtc::Buffer* encoded);
    private:
     AudioEncoder::EncodedInfo info_;
     rtc::ArrayView<const uint8_t> payload_;
   };
 
 };
 
 class MockAudioEncoderDeprecated final : public MockAudioEncoderBase {
  public:
-  using AudioEncoder::EncodeInternal;
-
   // Note, we explicitly chose not to create a mock for the Encode method.
   MOCK_METHOD4(EncodeInternal,
                EncodedInfo(uint32_t timestamp,
                            rtc::ArrayView<const int16_t> audio,
                            size_t max_encoded_bytes,
                            uint8_t* encoded));
 
   // A functor like MockAudioEncoder::CopyEncoding above, but which has the
   // deprecated Encode signature. Currently only used in one test and should be
   // removed once that backwards compatibility is.
@@ skipping 10 matching lines @@
                                          uint8_t* encoded);
    private:
     AudioEncoder::EncodedInfo info_;
     rtc::ArrayView<const uint8_t> payload_;
   };
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_CODING_CODECS_MOCK_MOCK_AUDIO_ENCODER_H_