Chromium Code Reviews| Index: webrtc/video/encoder_state_feedback_unittest.cc |
| diff --git a/webrtc/video/encoder_state_feedback_unittest.cc b/webrtc/video/encoder_state_feedback_unittest.cc |
| index 5351e1516b18e078799630297550498b4aa30bc1..593a967d8084362186fb646aa9a092602b6f055d 100644 |
| --- a/webrtc/video/encoder_state_feedback_unittest.cc |
| +++ b/webrtc/video/encoder_state_feedback_unittest.cc |
| @@ -21,9 +21,14 @@ namespace webrtc { |
| class MockVieEncoder : public ViEEncoder { |
| public: |
| - explicit MockVieEncoder(ProcessThread* process_thread) |
| - : ViEEncoder(1, process_thread, nullptr, nullptr, nullptr) {} |
| - ~MockVieEncoder() {} |
| + MockVieEncoder() |
| + : ViEEncoder(1, |
| + nullptr, |
| + VideoSendStream::Config::EncoderSettings("fake", 0, nullptr), |
| + nullptr, |
| + nullptr, |
| + nullptr) {} |
| + ~MockVieEncoder() { Stop(); } |
| MOCK_METHOD1(OnReceivedIntraFrameRequest, void(size_t)); |
| MOCK_METHOD1(OnReceivedSLI, void(uint8_t picture_id)); |
| @@ -33,7 +38,7 @@ class MockVieEncoder : public ViEEncoder { |
| class VieKeyRequestTest : public ::testing::Test { |
| public: |
| VieKeyRequestTest() |
| - : encoder_(&process_thread_), |
| + : encoder_(), |
|
pbos-webrtc
2016/07/13 12:35:38
pref removing from init-list
perkj_webrtc
2016/07/14 10:11:27
Done.
|
| simulated_clock_(123456789), |
| encoder_state_feedback_( |
| &simulated_clock_, |
| @@ -42,7 +47,6 @@ class VieKeyRequestTest : public ::testing::Test { |
| protected: |
| const uint32_t kSsrc = 1234; |
| - NiceMock<MockProcessThread> process_thread_; |
| MockVieEncoder encoder_; |
| SimulatedClock simulated_clock_; |
| EncoderStateFeedback encoder_state_feedback_; |