MediaController/Call instantiation.

talk/media/base/videoengine_unittest.h

Index: talk/media/base/videoengine_unittest.h
diff --git a/talk/media/base/videoengine_unittest.h b/talk/media/base/videoengine_unittest.h
index 5f00a0eca3c5399508667c93fc3c1257f265a6c5..502fae25c4ec16f362fa915c08b3652ecfd1e03b 100644
--- a/talk/media/base/videoengine_unittest.h
+++ b/talk/media/base/videoengine_unittest.h
@@ -36,9 +36,11 @@
 #include "talk/media/base/fakevideorenderer.h"
 #include "talk/media/base/mediachannel.h"
 #include "talk/media/base/streamparams.h"
+#include "talk/media/webrtc/fakewebrtccall.h"
 #include "webrtc/base/bytebuffer.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/timeutils.h"
+#include "webrtc/call.h"
 
 #define EXPECT_FRAME_WAIT(c, w, h, t) \
   EXPECT_EQ_WAIT((c), renderer_.num_rendered_frames(), (t)); \
@@ -96,7 +98,7 @@ inline int TimeBetweenSend(const cricket::VideoCodec& codec) {
 template<class T>
 class VideoEngineOverride : public T {
  public:
-  VideoEngineOverride() : T(nullptr) {
+  VideoEngineOverride() : T() {
   }
   virtual ~VideoEngineOverride() {
   }
@@ -448,6 +450,9 @@ template<class E, class C>
 class VideoMediaChannelTest : public testing::Test,
                               public sigslot::has_slots<> {
  protected:
+  VideoMediaChannelTest<E, C>()
+      : call_(webrtc::Call::Create(webrtc::Call::Config())) {}
+
   virtual cricket::VideoCodec DefaultCodec() = 0;
 
   virtual cricket::StreamParams DefaultSendStreamParams() {
@@ -457,7 +462,8 @@ class VideoMediaChannelTest : public testing::Test,
   virtual void SetUp() {
     cricket::Device device("test", "device");
     engine_.Init();
-    channel_.reset(engine_.CreateChannel(cricket::VideoOptions(), NULL));
+    channel_.reset(
+        engine_.CreateChannel(call_.get(), cricket::VideoOptions()));
     EXPECT_TRUE(channel_.get() != NULL);
     ConnectVideoChannelError();
     network_interface_.SetDestination(channel_.get());
@@ -1874,6 +1880,7 @@ class VideoMediaChannelTest : public testing::Test,
     EXPECT_TRUE(channel_->RemoveRecvStream(kSsrc + 2));
   }
 
+  rtc::scoped_ptr<webrtc::Call> call_;

[pbos-webrtc, 2015/09/08 14:47:41]

const rtc::scoped_ptr

[the sun, 2015/09/08 15:21:35]

Done.

   VideoEngineOverride<E> engine_;
   rtc::scoped_ptr<cricket::FakeVideoCapturer> video_capturer_;
   rtc::scoped_ptr<cricket::FakeVideoCapturer> video_capturer_2_;