commit c1aeaf0dc37d96f31c92f893f4e30e7a5f7cc2b7
author stefan <stefan@webrtc.org> Thu Oct 15 14:26:07 2015
committer Commit bot <commit-bot@chromium.org> Thu Oct 15 14:26:17 2015
tree bae8335df9007b063b355378e72f82b95e41eb1f
parent 543b6ca30a43eeb069c699291460ce6bacc7959d

Wire up packet_id / send time callbacks to webrtc via libjingle.

BUG=webrtc:4173

Review URL: https://codereview.webrtc.org/1363573002

Cr-Commit-Position: refs/heads/master@{#10289}

talk/session/media/channelmanager_unittest.cc

diff --git a/talk/session/media/channelmanager_unittest.cc b/talk/session/media/channelmanager_unittest.cc
index 6074d64..fa6aa2c 100644
--- a/talk/session/media/channelmanager_unittest.cc
+++ b/talk/session/media/channelmanager_unittest.cc
@@ -25,7 +25,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/app/webrtc/mediacontroller.h"
+#include "talk/app/webrtc/fakemediacontroller.h"
 #include "talk/media/base/fakecapturemanager.h"
 #include "talk/media/base/fakemediaengine.h"
 #include "talk/media/base/fakevideocapturer.h"
@@ -50,37 +50,24 @@
   VideoCodec(96, "rtx", 100, 200, 300, 0),
 };
 
-class FakeMediaController : public webrtc::MediaControllerInterface {
- public:
-  explicit FakeMediaController(webrtc::Call* call) : call_(call) {
-    RTC_DCHECK(nullptr != call);
-  }
-  ~FakeMediaController() override {}
-  webrtc::Call* call_w() override { return call_; }
-
- private:
-  webrtc::Call* call_;
-};
-
 class ChannelManagerTest : public testing::Test {
  protected:
   ChannelManagerTest()
-      : fake_call_(webrtc::Call::Config()),
-        fake_mc_(&fake_call_),
-        fme_(NULL),
-        fcm_(NULL),
-        cm_(NULL) {}
+      : fme_(new cricket::FakeMediaEngine()),
+        fdme_(new cricket::FakeDataEngine()),
+        fcm_(new cricket::FakeCaptureManager()),
+        cm_(new cricket::ChannelManager(fme_,
+                                        fdme_,
+                                        fcm_,
+                                        rtc::Thread::Current())),
+        fake_call_(webrtc::Call::Config()),
+        fake_mc_(cm_, &fake_call_),
+        transport_controller_(
+            new cricket::FakeTransportController(ICEROLE_CONTROLLING)) {}
 
   virtual void SetUp() {
-    fme_ = new cricket::FakeMediaEngine();
     fme_->SetAudioCodecs(MAKE_VECTOR(kAudioCodecs));
     fme_->SetVideoCodecs(MAKE_VECTOR(kVideoCodecs));
-    fdme_ = new cricket::FakeDataEngine();
-    fcm_ = new cricket::FakeCaptureManager();
-    cm_ = new cricket::ChannelManager(
-        fme_, fdme_, fcm_, rtc::Thread::Current());
-    transport_controller_ =
-        new cricket::FakeTransportController(ICEROLE_CONTROLLING);
   }
 
   virtual void TearDown() {
@@ -93,12 +80,12 @@
   }
 
   rtc::Thread worker_;
-  cricket::FakeCall fake_call_;
-  cricket::FakeMediaController fake_mc_;
   cricket::FakeMediaEngine* fme_;
   cricket::FakeDataEngine* fdme_;
   cricket::FakeCaptureManager* fcm_;
   cricket::ChannelManager* cm_;
+  cricket::FakeCall fake_call_;
+  cricket::FakeMediaController fake_mc_;
   cricket::FakeTransportController* transport_controller_;
 };