Introduce struct MediaConfig, with construction-time settings.

webrtc/media/base/videoengine_unittest.h

 /*
  * libjingle
  * Copyright 2014 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 24 matching lines @@
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/timeutils.h"
 #include "webrtc/call.h"
 #include "webrtc/media/base/fakenetworkinterface.h"
 #include "webrtc/media/base/fakevideocapturer.h"
 #include "webrtc/media/base/fakevideorenderer.h"
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/streamparams.h"
 #include "webrtc/media/webrtc/fakewebrtccall.h"
 
+// TODO(nisse): Improper include? Move declaration of MediaConfig elsewhere?
+#include "talk/app/webrtc/mediacontroller.h"
+
 #define EXPECT_FRAME_WAIT(c, w, h, t) \
   EXPECT_EQ_WAIT((c), renderer_.num_rendered_frames(), (t)); \
   EXPECT_EQ((w), renderer_.width()); \
   EXPECT_EQ((h), renderer_.height()); \
   EXPECT_EQ(0, renderer_.errors()); \
 
 #define EXPECT_FRAME_ON_RENDERER_WAIT(r, c, w, h, t) \
   EXPECT_EQ_WAIT((c), (r).num_rendered_frames(), (t)); \
   EXPECT_EQ((w), (r).width()); \
   EXPECT_EQ((h), (r).height()); \
@@ skipping 81 matching lines @@
   virtual cricket::VideoCodec DefaultCodec() = 0;
 
   virtual cricket::StreamParams DefaultSendStreamParams() {
     return cricket::StreamParams::CreateLegacy(kSsrc);
   }
 
   virtual void SetUp() {
     cricket::Device device("test", "device");
     engine_.Init();
     channel_.reset(
-        engine_.CreateChannel(call_.get(), cricket::VideoOptions()));
+                   engine_.CreateChannel(call_.get(),
+                                         webrtc::MediaConfig(),
+                                         cricket::VideoOptions()));
     EXPECT_TRUE(channel_.get() != NULL);
     network_interface_.SetDestination(channel_.get());
     channel_->SetInterface(&network_interface_);
     media_error_ = cricket::VideoMediaChannel::ERROR_NONE;
     cricket::VideoRecvParameters parameters;
     parameters.codecs = engine_.codecs();
     channel_->SetRecvParameters(parameters);
     EXPECT_TRUE(channel_->AddSendStream(DefaultSendStreamParams()));
     video_capturer_.reset(CreateFakeVideoCapturer());
     cricket::VideoFormat format(640, 480,
@@ skipping 1057 matching lines @@
   rtc::scoped_ptr<C> channel_;
   cricket::FakeNetworkInterface network_interface_;
   cricket::FakeVideoRenderer renderer_;
   cricket::VideoMediaChannel::Error media_error_;
 
   // Used by test cases where 2 streams are run on the same channel.
   cricket::FakeVideoRenderer renderer2_;
 };
 
 #endif  // WEBRTC_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_  NOLINT