Move ownership of Transport out of Session.

remoting/protocol/webrtc_connection_to_client.h

Index: remoting/protocol/webrtc_connection_to_client.h
diff --git a/remoting/protocol/webrtc_connection_to_client.h b/remoting/protocol/webrtc_connection_to_client.h
index 02919db619dadf48cfda449483a99422bc7d819e..751cdfbb5717257485dd3135dbce8c255b6ca93f 100644
--- a/remoting/protocol/webrtc_connection_to_client.h
+++ b/remoting/protocol/webrtc_connection_to_client.h
@@ -13,6 +13,7 @@
 #include "remoting/protocol/channel_dispatcher_base.h"
 #include "remoting/protocol/connection_to_client.h"
 #include "remoting/protocol/session.h"
+#include "remoting/protocol/webrtc_transport.h"
 
 namespace remoting {
 namespace protocol {
@@ -22,9 +23,12 @@ class HostEventDispatcher;
 
 class WebrtcConnectionToClient : public ConnectionToClient,
                                  public Session::EventHandler,
+                                 public WebrtcTransport::EventHandler,
                                  public ChannelDispatcherBase::EventHandler {
  public:
-  explicit WebrtcConnectionToClient(scoped_ptr<Session> session);
+  WebrtcConnectionToClient(
+      scoped_ptr<Session> session,
+      scoped_refptr<protocol::TransportContext> transport_context);
   ~WebrtcConnectionToClient() override;
 
   // ConnectionToClient interface.
@@ -43,8 +47,10 @@ class WebrtcConnectionToClient : public ConnectionToClient,
 
   // Session::EventHandler interface.
   void OnSessionStateChange(Session::State state) override;
-  void OnSessionRouteChange(const std::string& channel_name,
-                            const TransportRoute& route) override;
+
+  // WebrtcTransport::EventHandler interface
+  void OnWebrtcTransportConnected() override;
+  void OnWebrtcTransportError(ErrorCode error) override;
 
   // ChannelDispatcherBase::EventHandler interface.
   void OnChannelInitialized(ChannelDispatcherBase* channel_dispatcher) override;
@@ -57,6 +63,8 @@ class WebrtcConnectionToClient : public ConnectionToClient,
   // Event handler for handling events sent from this object.
   ConnectionToClient::EventHandler* event_handler_ = nullptr;
 
+  WebrtcTransport transport_;
+
   scoped_ptr<Session> session_;
 
   scoped_ptr<HostControlDispatcher> control_dispatcher_;