Index: chromecast/browser/devtools/remote_debugging_server.cc |
diff --git a/chromecast/browser/devtools/remote_debugging_server.cc b/chromecast/browser/devtools/remote_debugging_server.cc |
index b6dfb2278ebf86f8e634cfb305341f38a8d889b7..8f2dd80cea3ce4151aa49ad4be14482db9d16f2c 100644 |
--- a/chromecast/browser/devtools/remote_debugging_server.cc |
+++ b/chromecast/browser/devtools/remote_debugging_server.cc |
@@ -51,13 +51,13 @@ class UnixDomainServerSocketFactory |
private: |
// devtools_http_handler::DevToolsHttpHandler::ServerSocketFactory. |
- scoped_ptr<net::ServerSocket> CreateForHttpServer() override { |
- scoped_ptr<net::UnixDomainServerSocket> socket( |
+ std::unique_ptr<net::ServerSocket> CreateForHttpServer() override { |
+ std::unique_ptr<net::UnixDomainServerSocket> socket( |
new net::UnixDomainServerSocket( |
base::Bind(&content::CanUserConnectToDevTools), |
true /* use_abstract_namespace */)); |
if (socket->BindAndListen(socket_name_, kBackLog) != net::OK) |
- return scoped_ptr<net::ServerSocket>(); |
+ return std::unique_ptr<net::ServerSocket>(); |
return std::move(socket); |
} |
@@ -75,11 +75,11 @@ class TCPServerSocketFactory |
private: |
// devtools_http_handler::DevToolsHttpHandler::ServerSocketFactory. |
- scoped_ptr<net::ServerSocket> CreateForHttpServer() override { |
- scoped_ptr<net::ServerSocket> socket( |
+ std::unique_ptr<net::ServerSocket> CreateForHttpServer() override { |
+ std::unique_ptr<net::ServerSocket> socket( |
new net::TCPServerSocket(nullptr, net::NetLog::Source())); |
if (socket->ListenWithAddressAndPort(address_, port_, kBackLog) != net::OK) |
- return scoped_ptr<net::ServerSocket>(); |
+ return std::unique_ptr<net::ServerSocket>(); |
return socket; |
} |
@@ -91,7 +91,7 @@ class TCPServerSocketFactory |
}; |
#endif |
-scoped_ptr<DevToolsHttpHandler::ServerSocketFactory> CreateSocketFactory( |
+std::unique_ptr<DevToolsHttpHandler::ServerSocketFactory> CreateSocketFactory( |
uint16_t port) { |
#if defined(OS_ANDROID) |
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
@@ -100,10 +100,10 @@ scoped_ptr<DevToolsHttpHandler::ServerSocketFactory> CreateSocketFactory( |
socket_name = command_line->GetSwitchValueASCII( |
switches::kRemoteDebuggingSocketName); |
} |
- return scoped_ptr<DevToolsHttpHandler::ServerSocketFactory>( |
+ return std::unique_ptr<DevToolsHttpHandler::ServerSocketFactory>( |
new UnixDomainServerSocketFactory(socket_name)); |
#else |
- return scoped_ptr<DevToolsHttpHandler::ServerSocketFactory>( |
+ return std::unique_ptr<DevToolsHttpHandler::ServerSocketFactory>( |
new TCPServerSocketFactory("0.0.0.0", port)); |
#endif |
} |