Simplify PortAllocatorBase and make PortAllocator creation synchronous.

remoting/test/fake_port_allocator.h

Index: remoting/test/fake_port_allocator.h
diff --git a/remoting/test/fake_port_allocator.h b/remoting/test/fake_port_allocator.h
index 636e7a33a8d606f5a4ec49a31ec8620a562d1b5d..ed2e09541562c98106fca503e37ca931728bce31 100644
--- a/remoting/test/fake_port_allocator.h
+++ b/remoting/test/fake_port_allocator.h
@@ -10,22 +10,18 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "remoting/protocol/port_allocator_base.h"
 #include "remoting/protocol/port_allocator_factory.h"
-
-namespace rtc {
-class NetworkManager;
-}  // namespace rtc
+#include "third_party/webrtc/p2p/client/basicportallocator.h"
 
 namespace remoting {
 
 class FakeNetworkDispatcher;
 class FakePacketSocketFactory;
 
-class FakePortAllocator : public protocol::PortAllocatorBase {
+class FakePortAllocator : public cricket::BasicPortAllocator {
  public:
   FakePortAllocator(rtc::NetworkManager* network_manager,
-                    FakePacketSocketFactory* socket_factory);
+                    rtc::PacketSocketFactory* socket_factory);
   ~FakePortAllocator() override;
 
   // cricket::BasicPortAllocator overrides.
@@ -48,7 +44,8 @@ class FakePortAllocatorFactory : public protocol::PortAllocatorFactory {
   FakePacketSocketFactory* socket_factory() { return socket_factory_.get(); }
 
    // PortAllocatorFactory interface.
-  scoped_ptr<protocol::PortAllocatorBase> CreatePortAllocator() override;
+  scoped_ptr<cricket::PortAllocator> CreatePortAllocator(
+      scoped_refptr<protocol::TransportContext> transport_context) override;
 
  private:
   scoped_ptr<rtc::NetworkManager> network_manager_;