Remove VideoFrameType aliases for FrameType.

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

Index: webrtc/modules/video_coding/main/source/video_sender_unittest.cc
diff --git a/webrtc/modules/video_coding/main/source/video_sender_unittest.cc b/webrtc/modules/video_coding/main/source/video_sender_unittest.cc
index 13e6b99735f36ff2b95e5125aa6951fd11409a99..a4b40babc609f3855fbba32f3e0d36ec3c9c8a3e 100644
--- a/webrtc/modules/video_coding/main/source/video_sender_unittest.cc
+++ b/webrtc/modules/video_coding/main/source/video_sender_unittest.cc
@@ -236,16 +236,16 @@ class TestVideoSenderWithMockEncoder : public TestVideoSender {
       // No intra request expected.
       EXPECT_CALL(
           encoder_,
-          Encode(_,
-                 _,
-                 Pointee(ElementsAre(kDeltaFrame, kDeltaFrame, kDeltaFrame))))
-          .Times(1).WillRepeatedly(Return(0));
+          Encode(_, _, Pointee(ElementsAre(kVideoFrameDelta, kVideoFrameDelta,
+                                           kVideoFrameDelta))))
+          .Times(1)
+          .WillRepeatedly(Return(0));
       return;
     }
     assert(stream >= 0);
     assert(stream < kNumberOfStreams);
-    std::vector<FrameType> frame_types(kNumberOfStreams, kDeltaFrame);
-    frame_types[stream] = kKeyFrame;
+    std::vector<FrameType> frame_types(kNumberOfStreams, kVideoFrameDelta);
+    frame_types[stream] = kVideoFrameKey;
     EXPECT_CALL(
         encoder_,
         Encode(_,