Simplify PortAllocatorBase and make PortAllocator creation synchronous.

remoting/host/cast_extension_session.cc

 // 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.
 
 #include "remoting/host/cast_extension_session.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/synchronization/waitable_event.h"
-#include "net/url_request/url_request_context_getter.h"
+#include "base/thread_task_runner_handle.h"
 #include "remoting/host/client_session.h"
 #include "remoting/proto/control.pb.h"
-#include "remoting/protocol/chromium_port_allocator.h"
 #include "remoting/protocol/client_stub.h"
+#include "remoting/protocol/port_allocator_factory.h"
+#include "remoting/protocol/transport_context.h"
 #include "remoting/protocol/webrtc_video_capturer_adapter.h"
 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
 #include "third_party/libjingle/source/talk/app/webrtc/test/fakeconstraints.h"
 #include "third_party/libjingle/source/talk/app/webrtc/videosourceinterface.h"
 
 namespace remoting {
 
 // Used as the type attribute of all Cast protocol::ExtensionMessages.
 const char kExtensionMessageType[] = "cast_message";
 
@@ skipping 132 matching lines @@
   // Explicitly clear |create_session_desc_observer_|'s pointer to |this|,
   // since the CastExtensionSession is destructing. Otherwise,
   // |create_session_desc_observer_| would be left with a dangling pointer.
   create_session_desc_observer_->SetCastExtensionSession(nullptr);
 
   CleanupPeerConnection();
 }
 
 // static
 scoped_ptr<CastExtensionSession> 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) {
   scoped_ptr<CastExtensionSession> cast_extension_session(
-      new CastExtensionSession(caller_task_runner,
-                               url_request_context_getter,
-                               network_settings,
-                               client_session_control,
-                               client_stub));
+      new CastExtensionSession(transport_context,
+                               client_session_control, client_stub));
   if (!cast_extension_session->WrapTasksAndSave() ||
       !cast_extension_session->InitializePeerConnection()) {
     return nullptr;
   }
   return cast_extension_session;
 }
 
 void CastExtensionSession::OnCreateSessionDescription(
     webrtc::SessionDescriptionInterface* desc) {
   if (!caller_task_runner_->BelongsToCurrentThread()) {
@@ skipping 100 matching lines @@
     ParseAndAddICECandidate(client_message);
   } else {
     VLOG(1) << "Unexpected CastExtension Message: " << message.data();
   }
   return true;
 }
 
 // Private methods ------------------------------------------------------------
 
 CastExtensionSession::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)
-    : caller_task_runner_(caller_task_runner),
-      url_request_context_getter_(url_request_context_getter),
-      network_settings_(network_settings),
+    : caller_task_runner_(base::ThreadTaskRunnerHandle::Get()),
+      transport_context_(transport_context),
       client_session_control_(client_session_control),
       client_stub_(client_stub),
       stats_observer_(CastStatsObserver::Create()),
       received_offer_(false),
       has_grabbed_capturer_(false),
       signaling_thread_wrapper_(nullptr),
       worker_thread_wrapper_(nullptr),
       worker_thread_(kWorkerThreadName) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
-  DCHECK(url_request_context_getter_.get());
   DCHECK(client_session_control_);
   DCHECK(client_stub_);
 
   // The worker thread is created with base::MessageLoop::TYPE_IO because
   // the PeerConnection performs some port allocation operations on this thread
   // that require it. See crbug.com/404013.
   base::Thread::Options options(base::MessageLoop::TYPE_IO, 0);
   worker_thread_.StartWithOptions(options);
   worker_task_runner_ = worker_thread_.task_runner();
 }
@@ skipping 152 matching lines @@
   // DTLS-SRTP is the preferred encryption method. If set to kValueFalse, the
   // peer connection uses SDES. Disabling SDES as well will cause the peer
   // connection to fail to connect.
   // Note: For protection and unprotection of SRTP packets, the libjingle
   // ENABLE_EXTERNAL_AUTH flag must not be set.
   webrtc::FakeConstraints constraints;
   constraints.AddMandatory(webrtc::MediaConstraintsInterface::kEnableDtlsSrtp,
                            webrtc::MediaConstraintsInterface::kValueTrue);
 
   scoped_ptr<cricket::PortAllocator> port_allocator =
-      protocol::ChromiumPortAllocator::Create(url_request_context_getter_);
+      transport_context_->port_allocator_factory()->CreatePortAllocator(
+          transport_context_);
 
   webrtc::PeerConnectionInterface::RTCConfiguration rtc_config;
   peer_connection_ = peer_conn_factory_->CreatePeerConnection(
       rtc_config, &constraints,
       rtc::scoped_ptr<cricket::PortAllocator>(port_allocator.release()),
       nullptr, this);
 
   if (!peer_connection_.get()) {
     CleanupPeerConnection();
     return false;
@@ skipping 143 matching lines @@
   json.SetString(kWebRtcCandidate, candidate_str);
   std::string json_str;
   if (!base::JSONWriter::Write(json, &json_str)) {
     LOG(ERROR) << "Failed to serialize candidate message.";
     return;
   }
   SendMessageToClient(kSubjectNewCandidate, json_str);
 }
 
 }  // namespace remoting