Unify FrameType and VideoFrameType.

webrtc/modules/video_coding/codecs/test/videoprocessor.h

Index: webrtc/modules/video_coding/codecs/test/videoprocessor.h
diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor.h b/webrtc/modules/video_coding/codecs/test/videoprocessor.h
index 8c9cb1211ab96a0f21579bc47ef03b2de3ca37a0..4b6aed1d5b05ff116bba77588cc0ea80f2390fd5 100644
--- a/webrtc/modules/video_coding/codecs/test/videoprocessor.h
+++ b/webrtc/modules/video_coding/codecs/test/videoprocessor.h
@@ -147,7 +147,7 @@ class VideoProcessor {
   virtual size_t EncodedFrameSize() = 0;
 
   // Return the encoded frame type (key or delta).
-  virtual VideoFrameType EncodedFrameType() = 0;
+  virtual FrameType EncodedFrameType() = 0;
 
   // Return the number of dropped frames.
   virtual int NumberDroppedFrames() = 0;
@@ -183,7 +183,7 @@ class VideoProcessorImpl : public VideoProcessor {
   // Return the size of the encoded frame in bytes.
   size_t EncodedFrameSize() override;
   // Return the encoded frame type (key or delta).
-  VideoFrameType EncodedFrameType() override;
+  FrameType EncodedFrameType() override;
   // Return the number of dropped frames.
   int NumberDroppedFrames() override;
   // Return the number of spatial resizes.
@@ -212,7 +212,7 @@ class VideoProcessorImpl : public VideoProcessor {
   // If Init() has executed successfully.
   bool initialized_;
   size_t encoded_frame_size_;
-  VideoFrameType encoded_frame_type_;
+  FrameType encoded_frame_type_;
   int prev_time_stamp_;
   int num_dropped_frames_;
   int num_spatial_resizes_;