Embed a cricket::MediaConfig in RTCConfiguration.

webrtc/api/peerconnection.cc

Index: webrtc/api/peerconnection.cc
diff --git a/webrtc/api/peerconnection.cc b/webrtc/api/peerconnection.cc
index 691a512b6af158811e25c111c8662a8cb35328ed..fd656339a1515f9973dba140707e0176b3e927c7 100644
--- a/webrtc/api/peerconnection.cc
+++ b/webrtc/api/peerconnection.cc
@@ -562,7 +562,6 @@ PeerConnection::~PeerConnection() {
 }
 
 bool PeerConnection::Initialize(
-    const cricket::MediaConfig& media_config,
     const PeerConnectionInterface::RTCConfiguration& configuration,
     rtc::scoped_ptr<cricket::PortAllocator> allocator,
     rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
@@ -606,7 +605,8 @@ bool PeerConnection::Initialize(
   // No step delay is used while allocating ports.
   port_allocator_->set_step_delay(cricket::kMinimumStepDelay);
 
-  media_controller_.reset(factory_->CreateMediaController(media_config));
+  media_controller_.reset(
+      factory_->CreateMediaController(configuration.media_config));
 
   remote_stream_factory_.reset(
       new RemoteMediaStreamFactory(factory_->signaling_thread()));