Remove VideoFrameType aliases for FrameType.

webrtc/video/video_decoder_unittest.cc

Index: webrtc/video/video_decoder_unittest.cc
diff --git a/webrtc/video/video_decoder_unittest.cc b/webrtc/video/video_decoder_unittest.cc
index 4ad045600ed530645d46c66a09b1d8ae70c9b487..be09b191ac1813596c62439f298608c43a1948ed 100644
--- a/webrtc/video/video_decoder_unittest.cc
+++ b/webrtc/video/video_decoder_unittest.cc
@@ -86,13 +86,13 @@ TEST_F(VideoDecoderSoftwareFallbackWrapperTest,
       << "Decoder used even though fallback should be active.";
 
   // Should be able to recover on a keyframe.
-  encoded_image._frameType = kKeyFrame;
+  encoded_image._frameType = kVideoFrameKey;
   fake_decoder_.decode_return_code_ = WEBRTC_VIDEO_CODEC_OK;
   fallback_wrapper_.Decode(encoded_image, false, nullptr, nullptr, -1);
   EXPECT_EQ(2, fake_decoder_.decode_count_)
       << "Wrapper did not try to decode a keyframe using registered decoder.";
 
-  encoded_image._frameType = kDeltaFrame;
+  encoded_image._frameType = kVideoFrameDelta;
   fallback_wrapper_.Decode(encoded_image, false, nullptr, nullptr, -1);
   EXPECT_EQ(3, fake_decoder_.decode_count_)
       << "Decoder not used on future delta frames.";