MockAudioEncoder: Use a dedicated marker method for test expectations

webrtc/modules/audio_coding/main/acm2/codec_owner_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 97 matching lines @@
   AudioEncoder::EncodedInfo info;
   EXPECT_CALL(external_encoder, SampleRateHz())
       .WillRepeatedly(Return(kSampleRateHz));
 
   {
     InSequence s;
     info.encoded_timestamp = 0;
     EXPECT_CALL(external_encoder,
                 EncodeInternal(0, audio, arraysize(encoded), encoded))
         .WillOnce(Return(info));
-    EXPECT_CALL(external_encoder, Reset());
-    EXPECT_CALL(external_encoder, Reset());
+    EXPECT_CALL(external_encoder, Mark("A"));
+    EXPECT_CALL(external_encoder, Mark("B"));
     info.encoded_timestamp = 2;
     EXPECT_CALL(external_encoder,
                 EncodeInternal(2, audio, arraysize(encoded), encoded))
         .WillOnce(Return(info));
-    EXPECT_CALL(external_encoder, Reset());
+    EXPECT_CALL(external_encoder, Die());
   }
 
   info = codec_owner_.Encoder()->Encode(0, audio, arraysize(audio),
                                         arraysize(encoded), encoded);
   EXPECT_EQ(0u, info.encoded_timestamp);
-  external_encoder.Reset();  // Dummy call to mark the sequence of expectations.
+  external_encoder.Mark("A");
 
   // Change to internal encoder.
   CodecInst codec_inst = kDefaultCodecInst;
   codec_inst.pacsize = kPacketSizeSamples;
   codec_owner_.SetEncoders(codec_inst, -1, VADNormal, -1);
   // Don't expect any more calls to the external encoder.
   info = codec_owner_.Encoder()->Encode(1, audio, arraysize(audio),
                                         arraysize(encoded), encoded);
-  external_encoder.Reset();  // Dummy call to mark the sequence of expectations.
+  external_encoder.Mark("B");
 
   // Change back to external encoder again.
   codec_owner_.SetEncoders(&external_encoder, -1, VADNormal, -1);
   info = codec_owner_.Encoder()->Encode(2, audio, arraysize(audio),
                                         arraysize(encoded), encoded);
   EXPECT_EQ(2u, info.encoded_timestamp);
-  external_encoder.Reset();  // Dummy call to mark the sequence of expectations.
 }
 
 }  // namespace acm2
 }  // namespace webrtc