Remove VideoFrameType aliases for FrameType.

webrtc/common_types.h

 /*
  *  Copyright (c) 2012 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.
  */
 
@@ skipping 144 matching lines @@
     kRecordingAllChannelsMixed,
     kRecordingPreprocessing
 };
 
 enum FrameType {
   kEmptyFrame = 0,
   kAudioFrameSpeech = 1,
   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()
     : fraction_lost(0),
       cumulative_lost(0),
       extended_max_sequence_number(0),
       jitter(0) {}
 
   uint8_t fraction_lost;
   uint32_t cumulative_lost;
@@ skipping 716 matching lines @@
                                    uint32_t ssrc) = 0;
 };
 
 // RTCP mode to use. Compound mode is described by RFC 4585 and reduced-size
 // RTCP mode is described by RFC 5506.
 enum class RtcpMode { kOff, kCompound, kReducedSize };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_COMMON_TYPES_H_