Removing references to webrtc::PortAllocatorFactoryInterface.

remoting/protocol/webrtc_transport.cc

 // 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.
 
 #include "remoting/protocol/webrtc_transport.h"
 
 #include "base/callback_helpers.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task_runner_util.h"
 #include "jingle/glue/thread_wrapper.h"
+#include "remoting/protocol/chromium_port_allocator.h"
 #include "third_party/libjingle/source/talk/app/webrtc/test/fakeconstraints.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 #include "third_party/webrtc/modules/audio_device/include/fake_audio_device.h"
 
 using buzz::QName;
 using buzz::XmlElement;
 
 namespace remoting {
 namespace protocol {
 
@@ skipping 79 matching lines @@
 
  private:
   ResultCallback result_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(SetSessionDescriptionObserver);
 };
 
 }  // namespace
 
 WebrtcTransport::WebrtcTransport(
-    rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>

[Sergey Ulanov, 2015/12/04 18:54:07]

Pass PortAllocator instead of PortAllocatorFactory here?

-        port_allocator_factory,
+    const NetworkSettings& network_settings,
     TransportRole role,
     scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner)
-    : port_allocator_factory_(port_allocator_factory),
+    : network_settings_(network_settings),
       role_(role),
       worker_task_runner_(worker_task_runner),
       weak_factory_(this) {}
 
 WebrtcTransport::~WebrtcTransport() {}
 
 void WebrtcTransport::Start(EventHandler* event_handler,
                             Authenticator* authenticator) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
@@ skipping 117 matching lines @@
 
   webrtc::PeerConnectionInterface::IceServer stun_server;
   stun_server.urls.push_back("stun:stun.l.google.com:19302");
   webrtc::PeerConnectionInterface::RTCConfiguration rtc_config;
   rtc_config.servers.push_back(stun_server);
 
   webrtc::FakeConstraints constraints;
   constraints.AddMandatory(webrtc::MediaConstraintsInterface::kEnableDtlsSrtp,
                            webrtc::MediaConstraintsInterface::kValueTrue);
 
+  rtc::scoped_ptr<ChromiumPortAllocator> port_allocator(
+      ChromiumPortAllocator::Create(nullptr, network_settings_).release());

[Sergey Ulanov, 2015/12/04 18:54:07]

This is not right. This class shouldn't depend on ChromiumPortAllocator. It
should be possible to use it with other port allocators implementations.

+
   peer_connection_ = peer_connection_factory_->CreatePeerConnection(
-      rtc_config, &constraints, port_allocator_factory_, nullptr, this);
+      rtc_config, &constraints, std::move(port_allocator), nullptr, this);
 
   data_stream_adapter_.Initialize(peer_connection_,
                                   role_ == TransportRole::SERVER);
 
   if (role_ == TransportRole::CLIENT) {
     webrtc::FakeConstraints offer_config;
     offer_config.AddMandatory(
         webrtc::MediaConstraintsInterface::kOfferToReceiveVideo,
         webrtc::MediaConstraintsInterface::kValueTrue);
     offer_config.AddMandatory(
@@ skipping 201 matching lines @@
         Close(INCOMPATIBLE_PROTOCOL);
         return;
       }
     }
     pending_incoming_candidates_.clear();
   }
 }
 
 WebrtcTransportFactory::WebrtcTransportFactory(
     SignalStrategy* signal_strategy,
-    rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
-        port_allocator_factory,
+    const NetworkSettings& network_settings,
     TransportRole role)
     : signal_strategy_(signal_strategy),
-      port_allocator_factory_(port_allocator_factory),
+      network_settings_(network_settings),
       role_(role),
       worker_thread_("ChromotingWebrtcWorkerThread") {
   worker_thread_.StartWithOptions(
       base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
 }
 
 WebrtcTransportFactory::~WebrtcTransportFactory() {}
 
 scoped_ptr<Transport> WebrtcTransportFactory::CreateTransport() {
-  return make_scoped_ptr(new WebrtcTransport(port_allocator_factory_, role_,
+  return make_scoped_ptr(new WebrtcTransport(network_settings_, role_,
                                              worker_thread_.task_runner()));
 }
 
 }  // namespace protocol
 }  // namespace remoting