Adding "adapter" ORTC objects on top of ChannelManager/BaseChannel/etc.

webrtc/media/engine/webrtcmediaengine.cc

Index: webrtc/media/engine/webrtcmediaengine.cc
diff --git a/webrtc/media/engine/webrtcmediaengine.cc b/webrtc/media/engine/webrtcmediaengine.cc
index 1a828393daff3d1946fbb5a6c1c60db1f56797d6..50c4197ecd5bb758e397598fc5d3d3bfc206be94 100644
--- a/webrtc/media/engine/webrtcmediaengine.cc
+++ b/webrtc/media/engine/webrtcmediaengine.cc
@@ -53,16 +53,17 @@ class WebRtcMediaEngine2
 
 }  // namespace cricket
 
-cricket::MediaEngineInterface* CreateWebRtcMediaEngine(
+std::unique_ptr<cricket::MediaEngineInterface> CreateWebRtcMediaEngine(
     webrtc::AudioDeviceModule* adm,
     const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
         audio_decoder_factory,
     cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
     cricket::WebRtcVideoDecoderFactory* video_decoder_factory,
     rtc::scoped_refptr<webrtc::AudioMixer> audio_mixer) {
-  return new cricket::WebRtcMediaEngine2(adm, audio_decoder_factory,
-                                         video_encoder_factory,
-                                         video_decoder_factory, audio_mixer);
+  return std::unique_ptr<cricket::MediaEngineInterface>(
+      new cricket::WebRtcMediaEngine2(adm, audio_decoder_factory,
+                                      video_encoder_factory,
+                                      video_decoder_factory, audio_mixer));
 }
 
 void DestroyWebRtcMediaEngine(cricket::MediaEngineInterface* media_engine) {
@@ -74,7 +75,7 @@ namespace cricket {
 // TODO(ossu): Backwards-compatible interface. Will be deprecated once the
 // audio decoder factory is fully plumbed and used throughout WebRTC.
 // See: crbug.com/webrtc/6000
-MediaEngineInterface* WebRtcMediaEngineFactory::Create(
+std::unique_ptr<MediaEngineInterface> WebRtcMediaEngineFactory::Create(
     webrtc::AudioDeviceModule* adm,
     WebRtcVideoEncoderFactory* video_encoder_factory,
     WebRtcVideoDecoderFactory* video_decoder_factory) {
@@ -83,7 +84,7 @@ MediaEngineInterface* WebRtcMediaEngineFactory::Create(
       video_decoder_factory, nullptr);
 }
 
-MediaEngineInterface* WebRtcMediaEngineFactory::Create(
+std::unique_ptr<MediaEngineInterface> WebRtcMediaEngineFactory::Create(
     webrtc::AudioDeviceModule* adm,
     const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
         audio_decoder_factory,
@@ -96,7 +97,7 @@ MediaEngineInterface* WebRtcMediaEngineFactory::Create(
 
 // Used by PeerConnectionFactory to create a media engine passed into
 // ChannelManager.
-MediaEngineInterface* WebRtcMediaEngineFactory::Create(
+std::unique_ptr<MediaEngineInterface> WebRtcMediaEngineFactory::Create(
     webrtc::AudioDeviceModule* adm,
     const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
         audio_decoder_factory,