New flag is_screencast in VideoOptions.

webrtc/media/base/videoengine_unittest.h

Index: webrtc/media/base/videoengine_unittest.h
diff --git a/webrtc/media/base/videoengine_unittest.h b/webrtc/media/base/videoengine_unittest.h
index 0b190543e174d6df397b5f5b30d9072c908edac5..5d8309fbf49530bfdd5717e5e6c3e24098790883 100644
--- a/webrtc/media/base/videoengine_unittest.h
+++ b/webrtc/media/base/videoengine_unittest.h
@@ -128,8 +128,12 @@ class VideoMediaChannelTest : public testing::Test,
     EXPECT_TRUE(channel_->SetCapturer(kSsrc, video_capturer_.get()));
   }
 
+  virtual cricket::FakeVideoCapturer* CreateFakeVideoCapturer(

[perkj_webrtc, 2016/02/21 18:09:06]

Suggest CreateFakeScreenCast and keeep CreateFakeVideoCapturer or remove
CreateFakeVideoCapturer()

[nisse-webrtc, 2016/02/22 07:52:34]

Bot options are fine to me. I kept the no-args method for now, only to reduce
the amount of changes.

+      bool is_screencast) {
+    return new cricket::FakeVideoCapturer(is_screencast);
+  }
   virtual cricket::FakeVideoCapturer* CreateFakeVideoCapturer() {
-    return new cricket::FakeVideoCapturer();
+    return CreateFakeVideoCapturer(false);
   }
 
   // Utility method to setup an additional stream to send and receive video.
@@ -558,8 +562,7 @@ class VideoMediaChannelTest : public testing::Test,
     // Add an additional capturer, and hook up a renderer to receive it.
     cricket::FakeVideoRenderer renderer2;
     rtc::scoped_ptr<cricket::FakeVideoCapturer> capturer(
-        CreateFakeVideoCapturer());
-    capturer->SetScreencast(true);
+        CreateFakeVideoCapturer(true));
     const int kTestWidth = 160;
     const int kTestHeight = 120;
     cricket::VideoFormat format(kTestWidth, kTestHeight,
@@ -769,8 +772,12 @@ class VideoMediaChannelTest : public testing::Test,
     EXPECT_TRUE(SendFrame());
     EXPECT_FRAME_WAIT(1, codec.width, codec.height, kTimeout);
     rtc::scoped_ptr<cricket::FakeVideoCapturer> capturer(
-        CreateFakeVideoCapturer());
-    capturer->SetScreencast(true);
+        CreateFakeVideoCapturer(true));
+
+    cricket::VideoOptions video_options;
+    video_options.is_screencast = rtc::Optional<bool>(true);
+    channel_->SetVideoSend(kSsrc, true, &video_options);
+
     cricket::VideoFormat format(480, 360,
                                 cricket::VideoFormat::FpsToInterval(30),
                                 cricket::FOURCC_I420);
@@ -866,8 +873,7 @@ class VideoMediaChannelTest : public testing::Test,
     EXPECT_TRUE(channel_->AddSendStream(
         cricket::StreamParams::CreateLegacy(1)));
     rtc::scoped_ptr<cricket::FakeVideoCapturer> capturer1(
-        CreateFakeVideoCapturer());
-    capturer1->SetScreencast(true);
+        CreateFakeVideoCapturer(true));
     EXPECT_EQ(cricket::CS_RUNNING, capturer1->Start(capture_format));
     // Set up additional stream 2.
     cricket::FakeVideoRenderer renderer2;
@@ -878,8 +884,7 @@ class VideoMediaChannelTest : public testing::Test,
     EXPECT_TRUE(channel_->AddSendStream(
         cricket::StreamParams::CreateLegacy(2)));
     rtc::scoped_ptr<cricket::FakeVideoCapturer> capturer2(
-        CreateFakeVideoCapturer());
-    capturer2->SetScreencast(true);
+        CreateFakeVideoCapturer(true));
     EXPECT_EQ(cricket::CS_RUNNING, capturer2->Start(capture_format));
     // State for all the streams.
     EXPECT_TRUE(SetOneCodec(DefaultCodec()));
@@ -934,8 +939,7 @@ class VideoMediaChannelTest : public testing::Test,
     // Registering an external capturer is currently the same as screen casting
     // (update the test when this changes).
     rtc::scoped_ptr<cricket::FakeVideoCapturer> capturer(
-        CreateFakeVideoCapturer());
-    capturer->SetScreencast(true);
+        CreateFakeVideoCapturer(true));
     const std::vector<cricket::VideoFormat>* formats =
         capturer->GetSupportedFormats();
     cricket::VideoFormat capture_format = (*formats)[0];