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

webrtc/media/engine/webrtcmediaengine.h

Index: webrtc/media/engine/webrtcmediaengine.h
diff --git a/webrtc/media/engine/webrtcmediaengine.h b/webrtc/media/engine/webrtcmediaengine.h
index 17e79c6cc10297cd7cd3a79366bd02e2fc4a44e1..a9c3589c42fc0502fce95823941136b978e7570c 100644
--- a/webrtc/media/engine/webrtcmediaengine.h
+++ b/webrtc/media/engine/webrtcmediaengine.h
@@ -11,6 +11,7 @@
 #ifndef WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
 #define WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
 
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -35,19 +36,19 @@ class WebRtcMediaEngineFactory {
   // 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
-  static MediaEngineInterface* Create(
+  static std::unique_ptr<MediaEngineInterface> Create(
       webrtc::AudioDeviceModule* adm,
       WebRtcVideoEncoderFactory* video_encoder_factory,
       WebRtcVideoDecoderFactory* video_decoder_factory);
 
-  static MediaEngineInterface* Create(
+  static std::unique_ptr<MediaEngineInterface> Create(
       webrtc::AudioDeviceModule* adm,
       const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
           audio_decoder_factory,
       WebRtcVideoEncoderFactory* video_encoder_factory,
       WebRtcVideoDecoderFactory* video_decoder_factory);
 
-  static MediaEngineInterface* Create(
+  static std::unique_ptr<MediaEngineInterface> Create(
       webrtc::AudioDeviceModule* adm,
       const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
           audio_decoder_factory,