Untangle ViEChannel and ViEEncoder.

webrtc/modules/video_coding/video_coding_robustness_unittest.cc

Index: webrtc/modules/video_coding/video_coding_robustness_unittest.cc
diff --git a/webrtc/modules/video_coding/video_coding_robustness_unittest.cc b/webrtc/modules/video_coding/video_coding_robustness_unittest.cc
index dd6565d505f431faaee442816ecafe194c7ebdb8..51cffcdb2d4d9316c17165f093b2c6257570b9de 100644
--- a/webrtc/modules/video_coding/video_coding_robustness_unittest.cc
+++ b/webrtc/modules/video_coding/video_coding_robustness_unittest.cc
@@ -35,7 +35,7 @@ class VCMRobustnessTest : public ::testing::Test {
   virtual void SetUp() {
     clock_.reset(new SimulatedClock(0));
     ASSERT_TRUE(clock_.get() != NULL);
-    vcm_ = VideoCodingModule::Create(clock_.get(), &event_factory_);
+    vcm_.reset(VideoCodingModule::Create(clock_.get(), &event_factory_));
     ASSERT_TRUE(vcm_ != NULL);
     const size_t kMaxNackListSize = 250;
     const int kMaxPacketAgeToNack = 450;
@@ -47,7 +47,7 @@ class VCMRobustnessTest : public ::testing::Test {
     vcm_->RegisterExternalDecoder(&decoder_, video_codec_.plType);
   }
 
-  virtual void TearDown() { VideoCodingModule::Destroy(vcm_); }
+  virtual void TearDown() { vcm_.reset(); }
 
   void InsertPacket(uint32_t timestamp,
                     uint16_t seq_no,
@@ -69,7 +69,7 @@ class VCMRobustnessTest : public ::testing::Test {
     ASSERT_EQ(VCM_OK, vcm_->IncomingPacket(payload, kPayloadLen, rtp_info));
   }
 
-  VideoCodingModule* vcm_;
+  rtc::scoped_ptr<VideoCodingModule> vcm_;
   VideoCodec video_codec_;
   MockVCMFrameTypeCallback frame_type_callback_;
   MockPacketRequestCallback request_callback_;