Index: android_webview/native/aw_dev_tools_server.cc |
diff --git a/android_webview/native/aw_dev_tools_server.cc b/android_webview/native/aw_dev_tools_server.cc |
index 9d1a83f73cbe3217edee5c3fb2755d8a49fadc28..87a1e68071e0aa163ee10e70a3cd8f2572552959 100644 |
--- a/android_webview/native/aw_dev_tools_server.cc |
+++ b/android_webview/native/aw_dev_tools_server.cc |
@@ -96,26 +96,27 @@ 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); |
} |
- scoped_ptr<net::ServerSocket> CreateForTethering(std::string* name) override { |
+ std::unique_ptr<net::ServerSocket> CreateForTethering( |
+ std::string* name) override { |
*name = base::StringPrintf( |
kTetheringSocketName, getpid(), ++last_tethering_socket_); |
- scoped_ptr<net::UnixDomainServerSocket> socket( |
+ std::unique_ptr<net::UnixDomainServerSocket> socket( |
new net::UnixDomainServerSocket( |
base::Bind(&content::CanUserConnectToDevTools), |
true /* use_abstract_namespace */)); |
if (socket->BindAndListen(*name, kBackLog) != net::OK) |
- return scoped_ptr<net::ServerSocket>(); |
+ return std::unique_ptr<net::ServerSocket>(); |
return std::move(socket); |
} |
@@ -141,7 +142,7 @@ void AwDevToolsServer::Start() { |
if (devtools_http_handler_) |
return; |
- scoped_ptr<DevToolsHttpHandler::ServerSocketFactory> factory( |
+ std::unique_ptr<DevToolsHttpHandler::ServerSocketFactory> factory( |
new UnixDomainServerSocketFactory( |
base::StringPrintf(kSocketNameFormat, getpid()))); |
devtools_http_handler_.reset(new DevToolsHttpHandler( |