Index: chrome/tools/service_discovery_sniffer/service_discovery_sniffer.cc |
diff --git a/chrome/tools/service_discovery_sniffer/service_discovery_sniffer.cc b/chrome/tools/service_discovery_sniffer/service_discovery_sniffer.cc |
index e48edb8bb1bf1a0d3024768d84d2af39a616e54d..5d51f58736c7165a5649311f56414fd4aee76bb0 100644 |
--- a/chrome/tools/service_discovery_sniffer/service_discovery_sniffer.cc |
+++ b/chrome/tools/service_discovery_sniffer/service_discovery_sniffer.cc |
@@ -2,14 +2,15 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#include "chrome/tools/service_discovery_sniffer/service_discovery_sniffer.h" |
+ |
+#include <memory> |
#include <vector> |
#include "base/at_exit.h" |
#include "base/bind.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/message_loop/message_loop.h" |
#include "chrome/browser/local_discovery/service_discovery_client_impl.h" |
-#include "chrome/tools/service_discovery_sniffer/service_discovery_sniffer.h" |
#include "net/dns/mdns_client.h" |
namespace local_discovery { |
@@ -102,11 +103,13 @@ int main(int argc, char** argv) { |
return 1; |
} |
- scoped_ptr<net::MDnsClient> mdns_client = net::MDnsClient::CreateDefault(); |
- scoped_ptr<net::MDnsSocketFactory> socket_factory = |
+ std::unique_ptr<net::MDnsClient> mdns_client = |
+ net::MDnsClient::CreateDefault(); |
+ std::unique_ptr<net::MDnsSocketFactory> socket_factory = |
net::MDnsSocketFactory::CreateDefault(); |
mdns_client->StartListening(socket_factory.get()); |
- scoped_ptr<local_discovery::ServiceDiscoveryClient> service_discovery_client; |
+ std::unique_ptr<local_discovery::ServiceDiscoveryClient> |
+ service_discovery_client; |
service_discovery_client.reset( |
new local_discovery::ServiceDiscoveryClientImpl(mdns_client.get())); |
{ |