Unify FrameType and VideoFrameType.

webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc

Index: webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc
diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc b/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc
index 9b5c17b847a27a4a42e9b00326491fa5fcaa03b1..c6cd6dedb43dbb981c7abc09b889d7a086346f6a 100644
--- a/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc
+++ b/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc
@@ -46,7 +46,7 @@ class AcmReceiverTest : public AudioPacketizationCallback,
       : timestamp_(0),
         packet_sent_(false),
         last_packet_send_timestamp_(timestamp_),
-        last_frame_type_(kFrameEmpty) {
+        last_frame_type_(kEmptyFrame) {
     AudioCoding::Config config;
     config.transport = this;
     acm_.reset(new AudioCodingImpl(config));
@@ -121,7 +121,7 @@ class AcmReceiverTest : public AudioPacketizationCallback,
                    const uint8_t* payload_data,
                    size_t payload_len_bytes,
                    const RTPFragmentationHeader* fragmentation) override {
-    if (frame_type == kFrameEmpty)
+    if (frame_type == kEmptyFrame)
       return 0;
 
     rtp_header_.header.payloadType = payload_type;