diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-18 18:45:36 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-18 18:45:36 +0000 |
| commit | 48fe0c17eb3e7dae86045cf8f1e816f093a8d78b (patch) | |
| tree | a2fc61c4c1bebe4225d6822a37bdf51bd0d08e38 /net/dns | |
| parent | cd6f03067cfe2aa196c95a068a6799edaeee4b9e (diff) | |
| download | chromium_src-48fe0c17eb3e7dae86045cf8f1e816f093a8d78b.zip chromium_src-48fe0c17eb3e7dae86045cf8f1e816f093a8d78b.tar.gz chromium_src-48fe0c17eb3e7dae86045cf8f1e816f093a8d78b.tar.bz2 | |
Cleanup: base/scoped_ptr.h -> base/memory/scoped_ptr.h.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7631042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97344 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/dns')
| -rw-r--r-- | net/dns/dns_config_service.h | 3 | ||||
| -rw-r--r-- | net/dns/dns_config_service_posix.cc | 7 | ||||
| -rw-r--r-- | net/dns/dns_config_service_posix.h | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/net/dns/dns_config_service.h b/net/dns/dns_config_service.h index cd4d84c..535dcc1 100644 --- a/net/dns/dns_config_service.h +++ b/net/dns/dns_config_service.h @@ -6,8 +6,6 @@ #define NET_DNS_DNS_CONFIG_SERVICE_H_ #pragma once -#include <list> -#include <map> #include <string> #include <vector> @@ -88,4 +86,3 @@ class NET_EXPORT_PRIVATE DnsConfigService { } // namespace net #endif // NET_DNS_DNS_CONFIG_SERVICE_H_ - diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc index d610b1f..c79e43c 100644 --- a/net/dns/dns_config_service_posix.cc +++ b/net/dns/dns_config_service_posix.cc @@ -4,15 +4,17 @@ #include "net/dns/dns_config_service_posix.h" +#include <string> + #include "base/bind.h" #include "base/compiler_specific.h" #include "base/file_path.h" #include "base/files/file_path_watcher.h" #include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/observer_list.h" -#include "base/scoped_ptr.h" #include "base/threading/worker_pool.h" #include "net/base/ip_endpoint.h" #include "net/base/net_util.h" @@ -228,7 +230,7 @@ bool ConvertResToConfig(const struct __res_state& res, DnsConfig* dns_config) { dns_config->nameservers.clear(); -#if OS_LINUX +#if defined(OS_LINUX) // Initially, glibc stores IPv6 in _ext.nsaddrs and IPv4 in nsaddr_list. // Next (res_send.c::__libc_res_nsend), it copies nsaddr_list after nsaddrs. // If RES_ROTATE is enabled, the list is shifted left after each res_send. @@ -274,4 +276,3 @@ bool ConvertResToConfig(const struct __res_state& res, DnsConfig* dns_config) { } } // namespace net - diff --git a/net/dns/dns_config_service_posix.h b/net/dns/dns_config_service_posix.h index 10c04ef..1cdd0b2 100644 --- a/net/dns/dns_config_service_posix.h +++ b/net/dns/dns_config_service_posix.h @@ -11,8 +11,8 @@ #include "base/compiler_specific.h" #include "base/files/file_path_watcher.h" #include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/scoped_ptr.h" #include "base/threading/non_thread_safe.h" #include "net/base/net_export.h" #include "net/dns/dns_config_service.h" @@ -112,4 +112,3 @@ bool NET_EXPORT_PRIVATE ConvertResToConfig(const struct __res_state& res, } // namespace net #endif // NET_DNS_DNS_CONFIG_SERVICE_POSIX_H_ - |