Simplify PortAllocatorBase and make PortAllocator creation synchronous.

remoting/protocol/ice_transport_channel.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/ice_transport_channel.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "jingle/glue/utils.h"
 #include "net/base/net_errors.h"
 #include "remoting/protocol/channel_socket_adapter.h"
+#include "remoting/protocol/port_allocator_factory.h"
 #include "remoting/protocol/transport_context.h"
 #include "third_party/webrtc/base/network.h"
 #include "third_party/webrtc/p2p/base/constants.h"
 #include "third_party/webrtc/p2p/base/p2ptransportchannel.h"
 #include "third_party/webrtc/p2p/base/port.h"
 #include "third_party/webrtc/p2p/client/httpportallocator.h"
 
 namespace remoting {
 namespace protocol {
 
@@ skipping 49 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!name.empty());
   DCHECK(delegate);
   DCHECK(!callback.is_null());
 
   DCHECK(name_.empty());
   name_ = name;
   delegate_ = delegate;
   callback_ = callback;
 
-  transport_context_->CreatePortAllocator(
-      base::Bind(&IceTransportChannel::OnPortAllocatorCreated,
-                 weak_factory_.GetWeakPtr()));
-}
-
-void IceTransportChannel::OnPortAllocatorCreated(
-      scoped_ptr<cricket::PortAllocator> port_allocator){
-  DCHECK(!channel_.get());
-
-  port_allocator_ = std::move(port_allocator);
+  port_allocator_ =
+      transport_context_->port_allocator_factory()->CreatePortAllocator(
+          transport_context_);
 
   // Create P2PTransportChannel, attach signal handlers and connect it.
   // TODO(sergeyu): Specify correct component ID for the channel.
   channel_.reset(new cricket::P2PTransportChannel(
       std::string(), 0, nullptr, port_allocator_.get()));
   std::string ice_password = rtc::CreateRandomString(cricket::ICE_PWD_LENGTH);
   channel_->SetIceProtocolType(cricket::ICEPROTO_RFC5245);
   channel_->SetIceRole((transport_context_->role() == TransportRole::CLIENT)
                            ? cricket::ICEROLE_CONTROLLING
                            : cricket::ICEROLE_CONTROLLED);
@@ skipping 168 matching lines @@
 
   // Restart ICE by resetting ICE password.
   std::string ice_password = rtc::CreateRandomString(cricket::ICE_PWD_LENGTH);
   delegate_->OnChannelIceCredentials(this, ice_username_fragment_,
                                      ice_password);
   channel_->SetIceCredentials(ice_username_fragment_, ice_password);
 }
 
 }  // namespace protocol
 }  // namespace remoting