| Index: chrome/browser/extensions/api/dial/dial_service.h
|
| diff --git a/chrome/browser/extensions/api/dial/dial_service.h b/chrome/browser/extensions/api/dial/dial_service.h
|
| index 4ffaa177605159e7d3ce9cef972b11583599c21a..a9878904525019b88b77df6bc17302f37d805825 100644
|
| --- a/chrome/browser/extensions/api/dial/dial_service.h
|
| +++ b/chrome/browser/extensions/api/dial/dial_service.h
|
| @@ -5,12 +5,12 @@
|
| #ifndef CHROME_BROWSER_EXTENSIONS_API_DIAL_DIAL_SERVICE_H_
|
| #define CHROME_BROWSER_EXTENSIONS_API_DIAL_DIAL_SERVICE_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| #include "base/threading/thread_checker.h"
|
| @@ -167,7 +167,7 @@ class DialServiceImpl : public DialService,
|
| DialDeviceData* device);
|
|
|
| // The UDP socket.
|
| - scoped_ptr<net::UDPSocket> socket_;
|
| + std::unique_ptr<net::UDPSocket> socket_;
|
|
|
| // Buffer for socket reads.
|
| scoped_refptr<net::IOBufferWithSize> recv_buffer_;
|
| @@ -218,7 +218,7 @@ class DialServiceImpl : public DialService,
|
| void BindAndAddSocket(const net::IPAddress& bind_ip_address);
|
|
|
| // Creates a DialSocket with callbacks to this object.
|
| - scoped_ptr<DialSocket> CreateDialSocket();
|
| + std::unique_ptr<DialSocket> CreateDialSocket();
|
|
|
| // Sends a single discovery request to every socket that are currently open.
|
| void SendOneRequest();
|
| @@ -241,7 +241,7 @@ class DialServiceImpl : public DialService,
|
|
|
| // DialSockets for each network interface whose ip address was
|
| // successfully bound.
|
| - std::vector<scoped_ptr<DialSocket>> dial_sockets_;
|
| + std::vector<std::unique_ptr<DialSocket>> dial_sockets_;
|
|
|
| // The NetLog for this service.
|
| net::NetLog* net_log_;
|
|
|