Revert of Add full stack tests for MediaCodec.

video/video_quality_test.h

 /*
  *  Copyright (c) 2015 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.
  */
 #ifndef VIDEO_VIDEO_QUALITY_TEST_H_
 #define VIDEO_VIDEO_QUALITY_TEST_H_
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "media/engine/simulcast_encoder_adapter.h"
-#include "media/engine/webrtcvideoencoderfactory.h"
 #include "test/call_test.h"
 #include "test/frame_generator.h"
 #include "test/testsupport/trace_to_stderr.h"
 
 namespace webrtc {
 
 class VideoQualityTest : public test::CallTest {
  public:
   // Parameters are grouped into smaller structs to make it easier to set
   // the desired elements and skip unused, using aggregate initialization.
@@ skipping 10 matching lines @@
     struct Video {
       bool enabled;
       size_t width;
       size_t height;
       int32_t fps;
       int min_bitrate_bps;
       int target_bitrate_bps;
       int max_bitrate_bps;
       bool suspend_below_min_bitrate;
       std::string codec;
-      bool hw_encoder;
-      bool sw_fallback_encoder;
       int num_temporal_layers;
       int selected_tl;
       int min_transmit_bps;
       bool ulpfec;
       bool flexfec;
       std::string clip_name;  // "Generator" to generate frames instead.
       size_t capture_device_index;
     } video;
     struct Audio {
       bool enabled;
@@ skipping 76 matching lines @@
                   AudioReceiveStream** audio_receive_stream);
 
   void StartEncodedFrameLogs(VideoSendStream* stream);
   void StartEncodedFrameLogs(VideoReceiveStream* stream);
 
   // We need a more general capturer than the FrameGeneratorCapturer.
   std::unique_ptr<test::VideoCapturer> video_capturer_;
   std::vector<std::unique_ptr<test::VideoCapturer>> thumbnail_capturers_;
   std::unique_ptr<test::TraceToStderr> trace_to_stderr_;
   std::unique_ptr<test::FrameGenerator> frame_generator_;
-  std::unique_ptr<cricket::WebRtcVideoEncoderFactory> video_encoder_factory_;
   std::unique_ptr<VideoEncoder> video_encoder_;
+  std::unique_ptr<cricket::WebRtcVideoEncoderFactory> vp8_encoder_factory_;
 
   std::vector<std::unique_ptr<VideoEncoder>> thumbnail_encoders_;
   std::vector<VideoSendStream::Config> thumbnail_send_configs_;
   std::vector<VideoEncoderConfig> thumbnail_encoder_configs_;
   std::vector<VideoSendStream*> thumbnail_send_streams_;
   std::vector<VideoReceiveStream::Config> thumbnail_receive_configs_;
   std::vector<VideoReceiveStream*> thumbnail_receive_streams_;
 
   Clock* const clock_;
 
   int receive_logs_;
   int send_logs_;
 
   VideoSendStream::DegradationPreference degradation_preference_ =
       VideoSendStream::DegradationPreference::kMaintainFramerate;
   Params params_;
 };
 
 }  // namespace webrtc
 
 #endif  // VIDEO_VIDEO_QUALITY_TEST_H_