Move back receiver VCM into ViEChannel.

webrtc/video/vie_channel.h

Index: webrtc/video/vie_channel.h
diff --git a/webrtc/video/vie_channel.h b/webrtc/video/vie_channel.h
index 320ce7c1fc1b1091992c1b847571bbb68a2017ee..7ee381eae82ab4f57d0ad60af865377591f498e7 100644
--- a/webrtc/video/vie_channel.h
+++ b/webrtc/video/vie_channel.h
@@ -67,7 +67,6 @@ class ViEChannel : public VCMFrameTypeCallback,
   ViEChannel(Transport* transport,
              ProcessThread* module_process_thread,
              PayloadRouter* send_payload_router,
-             VideoCodingModule* vcm,
              RtcpIntraFrameObserver* intra_frame_observer,
              RtcpBandwidthObserver* bandwidth_observer,
              TransportFeedbackObserver* transport_feedback_observer,
@@ -79,7 +78,7 @@ class ViEChannel : public VCMFrameTypeCallback,
              bool sender);
   ~ViEChannel();
 
-  int32_t Init();
+  void Init();
 
   // Sets the encoder to use for the channel. |new_stream| indicates the encoder
   // type has changed and we should start a new RTP stream.
@@ -168,6 +167,7 @@ class ViEChannel : public VCMFrameTypeCallback,
   int32_t SetMTU(uint16_t mtu);
 
   // Gets the modules used by the channel.
+  VideoCodingModule* vcm();
   RtpRtcp* rtp_rtcp();
   ViEReceiver* vie_receiver();
   VCMProtectionCallback* vcm_protection_callback();
@@ -357,7 +357,7 @@ class ViEChannel : public VCMFrameTypeCallback,
   // Owned modules/classes.
   rtc::scoped_ptr<ViEChannelProtectionCallback> vcm_protection_callback_;
 
-  VideoCodingModule* const vcm_;
+  const rtc::scoped_ptr<VideoCodingModule> vcm_;
   ViEReceiver vie_receiver_;
   ViESyncModule vie_sync_;