Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(203)

Unified Diff: webrtc/pc/peerconnection.cc

Issue 2794943002: Delete MediaController class, move Call ownership to PeerConnection. (Closed)
Patch Set: Hack for injecting a FakeCall, and re-enable TestPacketOptionsAndOnPacketSent test. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/pc/peerconnection.cc
diff --git a/webrtc/pc/peerconnection.cc b/webrtc/pc/peerconnection.cc
index a3981039e6cfe89554092b4c14d7f2f7b0f175e4..4e85e4bda8ab893fb34e4582062e9b87e06a413c 100644
--- a/webrtc/pc/peerconnection.cc
+++ b/webrtc/pc/peerconnection.cc
@@ -457,11 +457,10 @@ bool PeerConnection::Initialize(
return false;
}
- media_controller_.reset(factory_->CreateMediaController(
- configuration.media_config, event_log_.get()));
-
session_.reset(new WebRtcSession(
- media_controller_.get(), factory_->network_thread(),
+ factory_->channel_manager(), configuration.media_config,
+ event_log_.get(),
+ factory_->network_thread(),
factory_->worker_thread(), factory_->signaling_thread(),
port_allocator_.get(),
std::unique_ptr<cricket::TransportController>(

Powered by Google App Engine
This is Rietveld 408576698