Unify FrameType and VideoFrameType.

webrtc/test/configurable_frame_size_encoder.h

 /*
  *  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 12 matching lines @@
  public:
   explicit ConfigurableFrameSizeEncoder(size_t max_frame_size);
   virtual ~ConfigurableFrameSizeEncoder();
 
   int32_t InitEncode(const VideoCodec* codec_settings,
                      int32_t number_of_cores,
                      size_t max_payload_size) override;
 
   int32_t Encode(const VideoFrame& input_image,
                  const CodecSpecificInfo* codec_specific_info,
-                 const std::vector<VideoFrameType>* frame_types) override;
+                 const std::vector<FrameType>* frame_types) override;
 
   int32_t RegisterEncodeCompleteCallback(
       EncodedImageCallback* callback) override;
 
   int32_t Release() override;
 
   int32_t SetChannelParameters(uint32_t packet_loss, int64_t rtt) override;
 
   int32_t SetRates(uint32_t new_bit_rate, uint32_t frame_rate) override;
 
   int32_t SetPeriodicKeyFrames(bool enable) override;
 
   int32_t CodecConfigParameters(uint8_t* buffer, int32_t size) override;
 
   int32_t SetFrameSize(size_t size);
 
  private:
   EncodedImageCallback* callback_;
   const size_t max_frame_size_;
   size_t current_frame_size_;
   rtc::scoped_ptr<uint8_t[]> buffer_;
 };
 
 }  // namespace test
 }  // namespace webrtc
 
 #endif  // WEBRTC_TEST_CONFIGURABLE_FRAME_SIZE_ENCODER_H_