Index: net/tools/gdig/gdig.cc |
diff --git a/net/tools/gdig/gdig.cc b/net/tools/gdig/gdig.cc |
index 7d9410d93e44c241de7149de141f04699adbd43f..c3df21f8bfe5b498d39bafb98f3598f8f93e52d1 100644 |
--- a/net/tools/gdig/gdig.cc |
+++ b/net/tools/gdig/gdig.cc |
@@ -3,6 +3,8 @@ |
// found in the LICENSE file. |
#include <stdio.h> |
+ |
+#include <memory> |
#include <string> |
#include <utility> |
@@ -12,7 +14,6 @@ |
#include "base/command_line.h" |
#include "base/files/file_util.h" |
#include "base/location.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/message_loop/message_loop.h" |
#include "base/single_thread_task_runner.h" |
#include "base/strings/string_number_conversions.h" |
@@ -225,10 +226,10 @@ class GDig { |
Result result_; |
base::CancelableClosure timeout_closure_; |
- scoped_ptr<DnsConfigService> dns_config_service_; |
- scoped_ptr<FileNetLogObserver> log_observer_; |
- scoped_ptr<NetLog> log_; |
- scoped_ptr<HostResolver> resolver_; |
+ std::unique_ptr<DnsConfigService> dns_config_service_; |
+ std::unique_ptr<FileNetLogObserver> log_observer_; |
+ std::unique_ptr<NetLog> log_; |
+ std::unique_ptr<HostResolver> resolver_; |
#if defined(OS_MACOSX) |
// Without this there will be a mem leak on osx. |
@@ -426,12 +427,12 @@ void GDig::OnDnsConfig(const DnsConfig& dns_config_const) { |
return; |
} |
- scoped_ptr<DnsClient> dns_client(DnsClient::CreateClient(NULL)); |
+ std::unique_ptr<DnsClient> dns_client(DnsClient::CreateClient(NULL)); |
dns_client->SetConfig(dns_config); |
HostResolver::Options options; |
options.max_concurrent_resolves = parallellism_; |
options.max_retry_attempts = 1u; |
- scoped_ptr<HostResolverImpl> resolver( |
+ std::unique_ptr<HostResolverImpl> resolver( |
new HostResolverImpl(options, log_.get())); |
resolver->SetDnsClient(std::move(dns_client)); |
resolver_ = std::move(resolver); |