Reland of 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"
@@ skipping 81 matching lines @@
   ~SetSessionDescriptionObserver() override {}
 
  private:
   ResultCallback result_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(SetSessionDescriptionObserver);
 };
 
 }  // namespace
 
-WebrtcTransport::WebrtcTransport(
-    rtc::Thread* worker_thread,
-    rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
-        port_allocator_factory,
-    TransportRole role)
+WebrtcTransport::WebrtcTransport(rtc::Thread* worker_thread,
+                                 PortAllocatorFactory* port_allocator_factory,
+                                 TransportRole role)
     : port_allocator_factory_(port_allocator_factory),
       role_(role),
       worker_thread_(worker_thread),
       weak_factory_(this) {}
 
 WebrtcTransport::~WebrtcTransport() {}
 
 void WebrtcTransport::Start(EventHandler* event_handler,
                             Authenticator* authenticator) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 14 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<cricket::PortAllocator> port_allocator(
+      port_allocator_factory_->CreatePortAllocator());
+
   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::SERVER)
     RequestNegotiation();
 }
 
 bool WebrtcTransport::ProcessTransportInfo(XmlElement* transport_info) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 328 matching lines @@
         return;
       }
     }
     pending_incoming_candidates_.clear();
   }
 }
 
 WebrtcTransportFactory::WebrtcTransportFactory(
     rtc::Thread* worker_thread,
     SignalStrategy* signal_strategy,
-    rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
-        port_allocator_factory,
+    scoped_ptr<PortAllocatorFactory> port_allocator_factory,
     TransportRole role)
     : worker_thread_(worker_thread),
       signal_strategy_(signal_strategy),
-      port_allocator_factory_(port_allocator_factory),
+      port_allocator_factory_(std::move(port_allocator_factory)),
       role_(role) {}
 
 WebrtcTransportFactory::~WebrtcTransportFactory() {}
 
 scoped_ptr<Transport> WebrtcTransportFactory::CreateTransport() {
-  return make_scoped_ptr(
-      new WebrtcTransport(worker_thread_, port_allocator_factory_, role_));
+  return make_scoped_ptr(new WebrtcTransport(
+      worker_thread_, port_allocator_factory_.get(), role_));
 }
 
 }  // namespace protocol
 }  // namespace remoting