commit ef35f069e739feaae16fdfcc815d7af5cb05e9ae
author pbos <pbos@webrtc.org> Mon Jul 27 08:37:06 2015 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jul 27 15:37:14 2015 +0000
tree 618d66c0853d9454b7164f49969db0c5cc658e99
parent 081af25c11aa3015e5da46d64532eb3b9b92f909

Remove webrtc::Config from ViEChannelGroup.

Also removing webrtc/experiments.h which is no longer used.

BUG=webrtc:1695
R=stefan@webrtc.org
TBR=mflodman@webrtc.org

Review URL: https://codereview.webrtc.org/1250513006

Cr-Commit-Position: refs/heads/master@{#9642}

webrtc/video_engine/encoder_state_feedback_unittest.cc

diff --git a/webrtc/video_engine/encoder_state_feedback_unittest.cc b/webrtc/video_engine/encoder_state_feedback_unittest.cc
index 07e1990..4102367 100644
--- a/webrtc/video_engine/encoder_state_feedback_unittest.cc
+++ b/webrtc/video_engine/encoder_state_feedback_unittest.cc
@@ -31,7 +31,7 @@
 class MockVieEncoder : public ViEEncoder {
  public:
   explicit MockVieEncoder(ProcessThread* process_thread, PacedSender* pacer)
-      : ViEEncoder(1, 1, config_, *process_thread, pacer, NULL, NULL, false) {}
+      : ViEEncoder(1, 1, *process_thread, pacer, NULL, NULL, false) {}
   ~MockVieEncoder() {}
 
   MOCK_METHOD1(OnReceivedIntraFrameRequest,
@@ -42,8 +42,6 @@
                void(uint32_t ssrc, uint64_t picture_id));
   MOCK_METHOD2(OnLocalSsrcChanged,
                void(uint32_t old_ssrc, uint32_t new_ssrc));
-
-  const Config config_;
 };
 
 class VieKeyRequestTest : public ::testing::Test {