Move ownership of Transport out of Session.

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"
@@ skipping 12 matching lines @@
 }  // namespace webrtc
 
 namespace remoting {
 namespace protocol {
 
 class TransportContext;
 
 class WebrtcTransport : public Transport,
                         public webrtc::PeerConnectionObserver {
  public:
+  class EventHandler {
+   public:
+    // Called when the transport is connected.
+    virtual void OnWebrtcTransportConnected() = 0;
+
+    // Called when there is an error connecting the session.
+    virtual void OnWebrtcTransportError(ErrorCode error) = 0;
+  };
+
   WebrtcTransport(rtc::Thread* worker_thread,
-                  scoped_refptr<TransportContext> transport_context);
+                  scoped_refptr<TransportContext> transport_context,
+                  EventHandler* event_handler);
   ~WebrtcTransport() override;
 
   webrtc::PeerConnectionInterface* peer_connection() {
     return peer_connection_;
   }
   webrtc::PeerConnectionFactoryInterface* peer_connection_factory() {
     return peer_connection_factory_;
   }
 
+  StreamChannelFactory* GetStreamChannelFactory();
+
   // Transport interface.
-  void Start(EventHandler* event_handler,
-             Authenticator* authenticator) override;
+  void Start(Authenticator* authenticator,
+             SendTransportInfoCallback send_transport_info_callback) override;
   bool ProcessTransportInfo(buzz::XmlElement* transport_info) override;
-  StreamChannelFactory* GetStreamChannelFactory() override;
-  StreamChannelFactory* GetMultiplexedChannelFactory() override;
-  WebrtcTransport* AsWebrtcTransport() override;
 
  private:
   void OnPortAllocatorCreated(
       scoped_ptr<cricket::PortAllocator> port_allocator);
 
   void OnLocalSessionDescriptionCreated(
       scoped_ptr<webrtc::SessionDescriptionInterface> description,
       const std::string& error);
   void OnLocalDescriptionSet(bool success, const std::string& error);
   void OnRemoteDescriptionSet(bool send_answer,
@@ skipping 16 matching lines @@
   void RequestNegotiation();
   void SendOffer();
   void EnsurePendingTransportInfoMessage();
   void SendTransportInfo();
   void AddPendingCandidatesIfPossible();
 
   void Close(ErrorCode error);
 
   base::ThreadChecker thread_checker_;
 
+  rtc::Thread* worker_thread_;
   scoped_refptr<TransportContext> transport_context_;
   EventHandler* event_handler_ = nullptr;
-  rtc::Thread* worker_thread_;
+  SendTransportInfoCallback send_transport_info_callback_;
 
   scoped_ptr<webrtc::FakeAudioDeviceModule> fake_audio_device_module_;
 
   rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface>
       peer_connection_factory_;
   rtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection_;
 
   bool negotiation_pending_ = false;
 
   scoped_ptr<buzz::XmlElement> pending_transport_info_message_;
   base::OneShotTimer transport_info_timer_;
 
   ScopedVector<webrtc::IceCandidateInterface> pending_incoming_candidates_;
 
   std::list<rtc::scoped_refptr<webrtc::MediaStreamInterface>>
       unclaimed_streams_;
 
   WebrtcDataStreamAdapter data_stream_adapter_;
 
   base::WeakPtrFactory<WebrtcTransport> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebrtcTransport);
 };
 
-class WebrtcTransportFactory : public TransportFactory {
- public:
-  WebrtcTransportFactory(rtc::Thread* worker_thread,
-                         scoped_refptr<TransportContext> transport_context);
-  ~WebrtcTransportFactory() override;
-
-  // TransportFactory interface.
-  scoped_ptr<Transport> CreateTransport() override;
-
- private:
-  rtc::Thread* worker_thread_;
-  scoped_refptr<TransportContext> transport_context_;
-
-  DISALLOW_COPY_AND_ASSIGN(WebrtcTransportFactory);
-};
-
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_