Unify FrameType and VideoFrameType.

webrtc/modules/video_coding/main/source/receiver_unittest.cc

 /*  Copyright (c) 2013 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.
  */
 
 #include <string.h>
@@ skipping 45 matching lines @@
     bool packet_available = stream_generator_->PopPacket(&packet, index);
     EXPECT_TRUE(packet_available);
     if (!packet_available)
       return kGeneralError;  // Return here to avoid crashes below.
     return receiver_.InsertPacket(packet, kWidth, kHeight);
   }
 
   int32_t InsertFrame(FrameType frame_type, bool complete) {
     int num_of_packets = complete ? 1 : 2;
     stream_generator_->GenerateFrame(
-        frame_type,
-        (frame_type != kFrameEmpty) ? num_of_packets : 0,
-        (frame_type == kFrameEmpty) ? 1 : 0,
-        clock_->TimeInMilliseconds());
+        frame_type, (frame_type != kEmptyFrame) ? num_of_packets : 0,
+        (frame_type == kEmptyFrame) ? 1 : 0, clock_->TimeInMilliseconds());
     int32_t ret = InsertPacketAndPop(0);
     if (!complete) {
       // Drop the second packet.
       VCMPacket packet;
       stream_generator_->PopPacket(&packet, 0);
     }
     clock_->AdvanceTimeMilliseconds(kDefaultFramePeriodMs);
     return ret;
   }
 
@@ skipping 439 matching lines @@
       receiver_.ReleaseFrame(frame);
       ++num_frames_return;
       EXPECT_GE(kMaxWaitTime, end_time - start_time);
     } else {
       EXPECT_EQ(kMaxWaitTime, end_time - start_time);
     }
   }
 }
 
 }  // namespace webrtc