Unify FrameType and VideoFrameType.

talk/media/webrtc/fakewebrtcvideoengine.h

 /*
  * libjingle
  * Copyright 2010 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 137 matching lines @@
     rtc::CritScope lock(&crit_);
     codec_settings_ = *codecSettings;
     return WEBRTC_VIDEO_CODEC_OK;
   }
 
   webrtc::VideoCodec GetCodecSettings() {
     rtc::CritScope lock(&crit_);
     return codec_settings_;
   }
 
-  virtual int32_t Encode(
-      const webrtc::VideoFrame& inputImage,
-      const webrtc::CodecSpecificInfo* codecSpecificInfo,
-      const std::vector<webrtc::VideoFrameType>* frame_types) {
+  virtual int32_t Encode(const webrtc::VideoFrame& inputImage,
+                         const webrtc::CodecSpecificInfo* codecSpecificInfo,
+                         const std::vector<webrtc::FrameType>* frame_types) {
     rtc::CritScope lock(&crit_);
     ++num_frames_encoded_;
     return WEBRTC_VIDEO_CODEC_OK;
   }
 
   virtual int32_t RegisterEncodeCompleteCallback(
       webrtc::EncodedImageCallback* callback) {
     return WEBRTC_VIDEO_CODEC_OK;
   }
 
@@ skipping 75 matching lines @@
   std::set<webrtc::VideoCodecType> supported_codec_types_;
   std::vector<WebRtcVideoEncoderFactory::VideoCodec> codecs_;
   std::vector<FakeWebRtcVideoEncoder*> encoders_;
   int num_created_encoders_;
   bool encoders_have_internal_sources_;
 };
 
 }  // namespace cricket
 
 #endif  // TALK_MEDIA_WEBRTC_FAKEWEBRTCVIDEOENGINE_H_