Simplify PortAllocatorBase and make PortAllocator creation synchronous.

remoting/host/cast_extension_session.h

 // Copyright 2014 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_HOST_CAST_EXTENSION_SESSION_H_
 #define REMOTING_HOST_CAST_EXTENSION_SESSION_H_
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
 #include "jingle/glue/thread_wrapper.h"
 #include "remoting/host/host_extension_session.h"
 #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h"
 #include "third_party/webrtc/base/scoped_ref_ptr.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 class WaitableEvent;
 }  // namespace base
 
-namespace net {
-class URLRequestContextGetter;
-}  // namespace net
-
 namespace webrtc {
 class MediaStreamInterface;
 }  // namespace webrtc
 
 namespace remoting {
 
 class CastCreateSessionDescriptionObserver;
 
 namespace protocol {
-struct NetworkSettings;
+class TransportContext;
 }  // namespace protocol
 
 // A HostExtensionSession implementation that enables WebRTC support using
 // the PeerConnection native API.
 class CastExtensionSession : public HostExtensionSession,
                              public webrtc::PeerConnectionObserver {
  public:
   ~CastExtensionSession() override;
 
   // Creates and returns a CastExtensionSession object, after performing
   // initialization steps on it. The caller must take ownership of the returned
   // object.
   static scoped_ptr<CastExtensionSession> Create(
-      scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
-      scoped_refptr<net::URLRequestContextGetter> url_request_context_getter,
-      const protocol::NetworkSettings& network_settings,
+      scoped_refptr<protocol::TransportContext> transport_context,
       ClientSessionControl* client_session_control,
       protocol::ClientStub* client_stub);
 
   // Called by webrtc::CreateSessionDescriptionObserver implementation.
   void OnCreateSessionDescription(webrtc::SessionDescriptionInterface* desc);
   void OnCreateSessionDescriptionFailure(const std::string& error);
 
   // HostExtensionSession interface.
   void OnCreateVideoCapturer(
       scoped_ptr<webrtc::DesktopCapturer>* capturer) override;
@@ skipping 13 matching lines @@
   void OnRenegotiationNeeded() override;
   void OnIceConnectionChange(
       webrtc::PeerConnectionInterface::IceConnectionState new_state) override;
   void OnIceGatheringChange(
       webrtc::PeerConnectionInterface::IceGatheringState new_state) override;
   void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override;
   void OnIceComplete() override;
 
  private:
   CastExtensionSession(
-      scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
-      scoped_refptr<net::URLRequestContextGetter> url_request_context_getter,
-      const protocol::NetworkSettings& network_settings,
+      scoped_refptr<protocol::TransportContext> transport_context,
       ClientSessionControl* client_session_control,
       protocol::ClientStub* client_stub);
 
   // Parses |message| for a Session Description and sets the remote
   // description, returning true if successful.
   bool ParseAndSetRemoteDescription(base::DictionaryValue* message);
 
   // Parses |message| for a PeerConnection ICE candidate and adds it to the
   // Peer Connection, returning true if successful.
   bool ParseAndAddICECandidate(base::DictionaryValue* message);
@@ skipping 89 matching lines @@
   scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner_;
 
   // Objects related to the WebRTC PeerConnection.
   rtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection_;
   rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> peer_conn_factory_;
   rtc::scoped_refptr<webrtc::MediaStreamInterface> stream_;
   rtc::scoped_refptr<CastCreateSessionDescriptionObserver>
       create_session_desc_observer_;
 
-  // Parameters passed to ChromiumPortAllocator on creation.
-  scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
-  const protocol::NetworkSettings& network_settings_;
+  // TransportContext for P2P transport.
+  scoped_refptr<protocol::TransportContext> transport_context_;
 
   // Interface to interact with ClientSession.
   ClientSessionControl* client_session_control_;
 
   // Interface through which messages can be sent to the client.
   protocol::ClientStub* client_stub_;
 
   // Used to track webrtc connection statistics.
   rtc::scoped_refptr<webrtc::StatsObserver> stats_observer_;
 
@@ skipping 18 matching lines @@
 
   // Worker thread that is wrapped to create |worker_thread_wrapper_|.
   base::Thread worker_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(CastExtensionSession);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CAST_EXTENSION_SESSION_H_