Remove VideoFrameType aliases for FrameType.

webrtc/common_types.h

Index: webrtc/common_types.h
diff --git a/webrtc/common_types.h b/webrtc/common_types.h
index 6b624bfce999c4b11e4417105e2009b15c7a8c2f..07faf6aefcfbcbd37bc5eead6d3b7a7c9768bf40 100644
--- a/webrtc/common_types.h
+++ b/webrtc/common_types.h
@@ -162,16 +162,8 @@ enum FrameType {
   kAudioFrameCN = 2,
   kVideoFrameKey = 3,
   kVideoFrameDelta = 4,
-  // TODO(pbos): Remove below aliases (non-kVideo prefixed) as soon as no
-  // VideoEncoder implementation in Chromium uses them.
-  kKeyFrame = kVideoFrameKey,
-  kDeltaFrame = kVideoFrameDelta,
 };
 
-// TODO(pbos): Remove VideoFrameType when VideoEncoder implementations no longer
-// depend on it.
-using VideoFrameType = FrameType;
-
 // Statistics for an RTCP channel
 struct RtcpStatistics {
   RtcpStatistics()