| Index: remoting/test/fake_port_allocator.h
|
| diff --git a/remoting/test/fake_port_allocator.h b/remoting/test/fake_port_allocator.h
|
| index cc5e6ebb5ae5b4b7dbcf04d9a902bcecc083815d..e5939151ea5f398b600033a1befcbabfeee1075c 100644
|
| --- a/remoting/test/fake_port_allocator.h
|
| +++ b/remoting/test/fake_port_allocator.h
|
| @@ -5,11 +5,11 @@
|
| #ifndef REMOTING_TEST_FAKE_PORT_ALLOCATOR_H_
|
| #define REMOTING_TEST_FAKE_PORT_ALLOCATOR_H_
|
|
|
| +#include <memory>
|
| #include <set>
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "remoting/protocol/port_allocator_factory.h"
|
| #include "third_party/webrtc/p2p/client/basicportallocator.h"
|
|
|
| @@ -48,12 +48,12 @@ class FakePortAllocatorFactory : public protocol::PortAllocatorFactory {
|
| FakePacketSocketFactory* socket_factory() { return socket_factory_.get(); }
|
|
|
| // PortAllocatorFactory interface.
|
| - scoped_ptr<cricket::PortAllocator> CreatePortAllocator(
|
| + std::unique_ptr<cricket::PortAllocator> CreatePortAllocator(
|
| scoped_refptr<protocol::TransportContext> transport_context) override;
|
|
|
| private:
|
| - scoped_ptr<rtc::NetworkManager> network_manager_;
|
| - scoped_ptr<FakePacketSocketFactory> socket_factory_;
|
| + std::unique_ptr<rtc::NetworkManager> network_manager_;
|
| + std::unique_ptr<FakePacketSocketFactory> socket_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FakePortAllocatorFactory);
|
| };
|
|
|