Remove VideoFrameType aliases for FrameType.

webrtc/modules/video_coding/main/source/media_optimization_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.
  */
 
@@ skipping 20 matching lines @@
 
   // This method mimics what happens in VideoSender::AddVideoFrame.
   void AddFrameAndAdvanceTime(uint32_t bitrate_bps, bool expect_frame_drop) {
     bool frame_dropped = media_opt_.DropFrame();
     EXPECT_EQ(expect_frame_drop, frame_dropped);
     if (!frame_dropped) {
       size_t bytes_per_frame = bitrate_bps * frame_time_ms_ / (8 * 1000);
       EncodedImage encoded_image;
       encoded_image._length = bytes_per_frame;
       encoded_image._timeStamp = next_timestamp_;
-      encoded_image._frameType = kKeyFrame;
+      encoded_image._frameType = kVideoFrameKey;
       ASSERT_EQ(VCM_OK, media_opt_.UpdateWithEncodedData(encoded_image));
     }
     next_timestamp_ += frame_time_ms_ * kSampleRate / 1000;
     clock_.AdvanceTimeMilliseconds(frame_time_ms_);
   }
 
   SimulatedClock clock_;
   MediaOptimization media_opt_;
   int frame_time_ms_;
   uint32_t next_timestamp_;
@@ skipping 59 matching lines @@
   // Test during 2 seconds.
   for (int time = 0; time < 2000; time += frame_time_ms_) {
     EXPECT_FALSE(media_opt_.IsVideoSuspended());
     ASSERT_NO_FATAL_FAILURE(
         AddFrameAndAdvanceTime((kThresholdBps + kWindowBps) / 1000, false));
   }
 }
 
 }  // namespace media_optimization
 }  // namespace webrtc