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

webrtc/p2p/base/udptransport.h

Index: webrtc/p2p/base/udptransport.h
diff --git a/webrtc/p2p/base/udptransport.h b/webrtc/p2p/base/udptransport.h
index e8bd49382f22958f588d165a81c791a438e4efbe..00027c8ad52458a25b219b34d383b5cc36b3b216 100644
--- a/webrtc/p2p/base/udptransport.h
+++ b/webrtc/p2p/base/udptransport.h
@@ -14,7 +14,7 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/api/udptransportinterface.h"
+#include "webrtc/api/ortc/udptransportinterface.h"
 #include "webrtc/base/asyncpacketsocket.h"  // For PacketOptions.
 #include "webrtc/base/optional.h"
 #include "webrtc/base/thread_checker.h"
@@ -31,8 +31,8 @@ namespace cricket {
 
 // Implementation of UdpTransportInterface.
 // Used by OrtcFactory.
-class UdpTransport : public webrtc::UdpTransportInterface,
-                     public rtc::PacketTransportInternal {
+class UdpTransport : public rtc::PacketTransportInternal,
+                     virtual public webrtc::UdpTransportInterface {
  public:
   // |transport_name| is only used for identification/logging.
   // |socket| must be non-null.
@@ -80,6 +80,7 @@ class UdpTransport : public webrtc::UdpTransportInterface,
   rtc::SocketAddress remote_address_;
   rtc::ThreadChecker network_thread_checker_;
 };
+
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_UDPTRANSPORT_H_