| Index: webrtc/media/engine/webrtcvideoengine2.h | 
| diff --git a/webrtc/media/engine/webrtcvideoengine2.h b/webrtc/media/engine/webrtcvideoengine2.h | 
| index ccf753e9fc663bb6cec50bc7ea364b08df80adbf..728bce009f5c12b26862602d4234164477dbe14d 100644 | 
| --- a/webrtc/media/engine/webrtcvideoengine2.h | 
| +++ b/webrtc/media/engine/webrtcvideoengine2.h | 
| @@ -158,7 +158,9 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport { | 
| bool SetSink(uint32_t ssrc, | 
| rtc::VideoSinkInterface<VideoFrame>* sink) override; | 
| bool GetStats(VideoMediaInfo* info) override; | 
| -  bool SetCapturer(uint32_t ssrc, VideoCapturer* capturer) override; | 
| +  void SetSource( | 
| +      uint32_t ssrc, | 
| +      rtc::VideoSourceInterface<cricket::VideoFrame>* source) override; | 
|  | 
| void OnPacketReceived(rtc::Buffer* packet, | 
| const rtc::PacketTime& packet_time) override; | 
| @@ -224,7 +226,7 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport { | 
| static std::string CodecSettingsVectorToString( | 
| const std::vector<VideoCodecSettings>& codecs); | 
|  | 
| -  // Wrapper for the sender part, this is where the capturer is connected and | 
| +  // Wrapper for the sender part, this is where the source is connected and | 
| // frames are then converted from cricket frames to webrtc frames. | 
| class WebRtcVideoSendStream | 
| : public rtc::VideoSinkInterface<cricket::VideoFrame>, | 
| @@ -247,9 +249,9 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport { | 
| void SetSendParameters(const ChangedSendParameters& send_params); | 
|  | 
| void OnFrame(const cricket::VideoFrame& frame) override; | 
| -    bool SetCapturer(VideoCapturer* capturer); | 
| +    void SetSource(rtc::VideoSourceInterface<cricket::VideoFrame>* source); | 
| void MuteStream(bool mute); | 
| -    bool DisconnectCapturer(); | 
| +    void DisconnectSource(); | 
|  | 
| void Start(); | 
| void Stop(); | 
| @@ -347,12 +349,12 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport { | 
| webrtc::Call* const call_; | 
| rtc::VideoSinkWants sink_wants_; | 
| // Counter used for deciding if the video resolution is currently | 
| -    // restricted by CPU usage. It is reset if |capturer_| is changed. | 
| +    // restricted by CPU usage. It is reset if |source_| is changed. | 
| int cpu_restricted_counter_; | 
| // Total number of times resolution as been requested to be changed due to | 
| // CPU adaptation. | 
| int number_of_cpu_adapt_changes_; | 
| -    VideoCapturer* capturer_; | 
| +    rtc::VideoSourceInterface<cricket::VideoFrame>* source_; | 
| WebRtcVideoEncoderFactory* const external_encoder_factory_ | 
| GUARDED_BY(lock_); | 
|  | 
| @@ -374,7 +376,7 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport { | 
| int64_t first_frame_timestamp_ms_ GUARDED_BY(lock_); | 
|  | 
| // The timestamp of the last frame received | 
| -    // Used to generate timestamp for the black frame when capturer is removed | 
| +    // Used to generate timestamp for the black frame when source is removed | 
| int64_t last_frame_timestamp_ms_ GUARDED_BY(lock_); | 
| }; | 
|  | 
|  |