Move ownership of receive ViEChannel to VideoReceiveStream.

webrtc/video/video_receive_stream.h

Index: webrtc/video/video_receive_stream.h
diff --git a/webrtc/video/video_receive_stream.h b/webrtc/video/video_receive_stream.h
index a16eab4529ea1e1ecd7a2c28da45573815fc1dd5..6d00942df44aacb283e3ff93916216da6ae8be2b 100644
--- a/webrtc/video/video_receive_stream.h
+++ b/webrtc/video/video_receive_stream.h
@@ -41,7 +41,8 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,
                      ChannelGroup* channel_group,
                      int channel_id,
                      const VideoReceiveStream::Config& config,
-                     webrtc::VoiceEngine* voice_engine);
+                     webrtc::VoiceEngine* voice_engine,
+                     ProcessThread* process_thread);
   ~VideoReceiveStream() override;
 
   // webrtc::ReceiveStream implementation.
@@ -74,12 +75,10 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,
   Clock* const clock_;
 
   ChannelGroup* const channel_group_;
-  const int channel_id_;
 
-  ViEChannel* vie_channel_;
   rtc::scoped_ptr<IncomingVideoStream> incoming_video_stream_;
-
   rtc::scoped_ptr<ReceiveStatisticsProxy> stats_proxy_;
+  rtc::scoped_ptr<ViEChannel> vie_channel_;
 };
 }  // namespace internal
 }  // namespace webrtc