Add MessageChanneFactory interface and use it in ChannelDispatcherBase.

remoting/protocol/webrtc_transport.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_
 #define REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "base/timer/timer.h"
 #include "remoting/protocol/port_allocator_factory.h"
 #include "remoting/protocol/transport.h"
 #include "remoting/protocol/webrtc_data_stream_adapter.h"
 #include "remoting/signaling/signal_strategy.h"
 #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h"
 
 namespace webrtc {
 class FakeAudioDeviceModule;
 }  // namespace webrtc
 
 namespace remoting {
 namespace protocol {
 
 class TransportContext;
+class MessageChannelFactory;
 
 class WebrtcTransport : public Transport,
                         public webrtc::PeerConnectionObserver {
  public:
   class EventHandler {
    public:
     // Called after |peer_connection| has been created but before handshake. The
     // handler should create data channels and media streams. Renegotiation will
     // be required in two cases after this method returns:
     //   1. When the first data channel is created, if it wasn't created by this
@@ skipping 21 matching lines @@
 
   webrtc::PeerConnectionInterface* peer_connection() {
     return peer_connection_;
   }
   webrtc::PeerConnectionFactoryInterface* peer_connection_factory() {
     return peer_connection_factory_;
   }
 
   // Factories for outgoing and incoming data channels. Must be used only after
   // the transport is connected.
-  StreamChannelFactory* outgoing_channel_factory() {
-    return &outgoing_data_stream_adapter_;
+  MessageChannelFactory* outgoing_channel_factory() {
+    return outgoing_channel_factory_.get();
   }
-  StreamChannelFactory* incoming_channel_factory() {
-    return &incoming_data_stream_adapter_;
+  MessageChannelFactory* incoming_channel_factory() {
+    return incoming_channel_factory_.get();
   }
 
   // Transport interface.
   void Start(Authenticator* authenticator,
              SendTransportInfoCallback send_transport_info_callback) override;
   bool ProcessTransportInfo(buzz::XmlElement* transport_info) override;
 
  private:
   void OnLocalSessionDescriptionCreated(
       scoped_ptr<webrtc::SessionDescriptionInterface> description,
@@ skipping 42 matching lines @@
   bool connected_ = false;
 
   scoped_ptr<buzz::XmlElement> pending_transport_info_message_;
   base::OneShotTimer transport_info_timer_;
 
   ScopedVector<webrtc::IceCandidateInterface> pending_incoming_candidates_;
 
   WebrtcDataStreamAdapter outgoing_data_stream_adapter_;
   WebrtcDataStreamAdapter incoming_data_stream_adapter_;
 
+  // TODO(sergeyu): Remove these and implement MessageChannelFactory in
+  // WebrtcDataStreamAdapter.
+  scoped_ptr<MessageChannelFactory> outgoing_channel_factory_;
+  scoped_ptr<MessageChannelFactory> incoming_channel_factory_;
+
   base::WeakPtrFactory<WebrtcTransport> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebrtcTransport);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_