Unify FrameType and VideoFrameType.

webrtc/modules/video_coding/main/source/video_sender_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 226 matching lines @@
       EXPECT_CALL(
           encoder_,
           Encode(_,
                  _,
                  Pointee(ElementsAre(kDeltaFrame, kDeltaFrame, kDeltaFrame))))
           .Times(1).WillRepeatedly(Return(0));
       return;
     }
     assert(stream >= 0);
     assert(stream < kNumberOfStreams);
-    std::vector<VideoFrameType> frame_types(kNumberOfStreams, kDeltaFrame);
+    std::vector<FrameType> frame_types(kNumberOfStreams, kDeltaFrame);
     frame_types[stream] = kKeyFrame;
     EXPECT_CALL(
         encoder_,
         Encode(_,
                _,
                Pointee(ElementsAreArray(&frame_types[0], frame_types.size()))))
         .Times(1).WillRepeatedly(Return(0));
   }
 
   static void ConfigureStream(int width,
@@ skipping 194 matching lines @@
   }
   {
     // TODO(andresp): Find out why this fails with framerate = 7.5
     Vp8StreamInfo expected = {{7.0, 7.0, 7.0}, {high_b, high_b, high_b}};
     EXPECT_THAT(SimulateWithFramerate(7.0), MatchesVp8StreamInfo(expected));
   }
 }
 }  // namespace
 }  // namespace vcm
 }  // namespace webrtc