Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(183)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/dns/dns_config_service_win.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/base/mime_util_unittest.cc ('K') | « net/dns/dns_config_service_win.h ('k') | net/dns/dns_config_service_win_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/dns/dns_config_service_win.cc
diff --git a/net/dns/dns_config_service_win.cc b/net/dns/dns_config_service_win.cc
index 192ad7a0762eaa7af73a97420501fc8beae6a2db..ce034f7392815891108fd28aa5c8d46f6ce21690 100644
--- a/net/dns/dns_config_service_win.cc
+++ b/net/dns/dns_config_service_win.cc
@@ -90,8 +90,7 @@ class RegistryReader : public base::NonThreadSafe {
return (result == ERROR_FILE_NOT_FOUND);
}
- bool ReadDword(const wchar_t* name,
- DnsSystemSettings::RegDword* out) const {
+ bool ReadDword(const wchar_t* name, DnsSystemSettings::RegDword* out) const {
DCHECK(CalledOnValidThread());
out->set = false;
if (!key_.Valid()) {
@@ -167,10 +166,9 @@ bool ReadDevolutionSetting(const RegistryReader& reader,
// Reads DnsSystemSettings from IpHelper and registry.
ConfigParseWinResult ReadSystemSettings(DnsSystemSettings* settings) {
- settings->addresses = ReadIpHelper(GAA_FLAG_SKIP_ANYCAST |
- GAA_FLAG_SKIP_UNICAST |
- GAA_FLAG_SKIP_MULTICAST |
- GAA_FLAG_SKIP_FRIENDLY_NAME);
+ settings->addresses =
+ ReadIpHelper(GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_UNICAST |
+ GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_FRIENDLY_NAME);
if (!settings->addresses.get())
return CONFIG_PARSE_WIN_READ_IPHELPER;
@@ -180,8 +178,7 @@ ConfigParseWinResult ReadSystemSettings(DnsSystemSettings* settings) {
RegistryReader policy_reader(kPolicyPath);
RegistryReader primary_dns_suffix_reader(kPrimaryDnsSuffixPath);
- if (!policy_reader.ReadString(L"SearchList",
- &settings->policy_search_list)) {
+ if (!policy_reader.ReadString(L"SearchList", &settings->policy_search_list)) {
return CONFIG_PARSE_WIN_READ_POLICY_SEARCHLIST;
}
@@ -219,9 +216,9 @@ ConfigParseWinResult ReadSystemSettings(DnsSystemSettings* settings) {
// Default address of "localhost" and local computer name can be overridden
// by the HOSTS file, but if it's not there, then we need to fill it in.
HostsParseWinResult AddLocalhostEntries(DnsHosts* hosts) {
- const unsigned char kIPv4Localhost[] = { 127, 0, 0, 1 };
- const unsigned char kIPv6Localhost[] = { 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1 };
+ const unsigned char kIPv4Localhost[] = {127, 0, 0, 1};
+ const unsigned char kIPv6Localhost[] = {0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1};
IPAddressNumber loopback_ipv4(kIPv4Localhost,
kIPv4Localhost + arraysize(kIPv4Localhost));
IPAddressNumber loopback_ipv6(kIPv6Localhost,
@@ -251,10 +248,8 @@ HostsParseWinResult AddLocalhostEntries(DnsHosts* hosts) {
return HOSTS_PARSE_WIN_OK;
scoped_ptr<IP_ADAPTER_ADDRESSES, base::FreeDeleter> addresses =
- ReadIpHelper(GAA_FLAG_SKIP_ANYCAST |
- GAA_FLAG_SKIP_DNS_SERVER |
- GAA_FLAG_SKIP_MULTICAST |
- GAA_FLAG_SKIP_FRIENDLY_NAME);
+ ReadIpHelper(GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_DNS_SERVER |
+ GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_FRIENDLY_NAME);
if (!addresses.get())
return HOSTS_PARSE_WIN_IPHELPER_FAILED;
@@ -313,7 +308,7 @@ class RegistryWatcher : public base::win::ObjectWatcher::Delegate,
virtual void OnObjectSignaled(HANDLE object) OVERRIDE {
DCHECK(CalledOnValidThread());
bool succeeded = (key_.StartWatching() == ERROR_SUCCESS) &&
- watcher_.StartWatching(key_.watch_event(), this);
+ watcher_.StartWatching(key_.watch_event(), this);
if (!succeeded && key_.Valid()) {
watcher_.StopWatching();
key_.StopWatching();
@@ -341,8 +336,8 @@ bool IsStatelessDiscoveryAddress(const IPAddressNumber& address) {
0xfe, 0xc0, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
- return std::equal(kPrefix, kPrefix + arraysize(kPrefix),
- address.begin()) && (address.back() < 4);
+ return std::equal(kPrefix, kPrefix + arraysize(kPrefix), address.begin()) &&
+ (address.back() < 4);
}
// Returns the path to the HOSTS file.
@@ -350,8 +345,8 @@ base::FilePath GetHostsPath() {
TCHAR buffer[MAX_PATH];
UINT rc = GetSystemDirectory(buffer, MAX_PATH);
DCHECK(0 < rc && rc < MAX_PATH);
- return base::FilePath(buffer).Append(
- FILE_PATH_LITERAL("drivers\\etc\\hosts"));
+ return base::FilePath(buffer)
+ .Append(FILE_PATH_LITERAL("drivers\\etc\\hosts"));
}
void ConfigureSuffixSearch(const DnsSystemSettings& settings,
@@ -429,8 +424,8 @@ void ConfigureSuffixSearch(const DnsSystemSettings& settings,
// behavior (see also ParseSearchList). If a suffix is not valid, it will be
// discarded when the fully-qualified name is converted to DNS format.
- unsigned num_dots = std::count(primary_suffix.begin(),
- primary_suffix.end(), '.');
+ unsigned num_dots =
+ std::count(primary_suffix.begin(), primary_suffix.end(), '.');
for (size_t offset = 0; num_dots >= devolution.level.value; --num_dots) {
offset = primary_suffix.find('.', offset + 1);
@@ -547,14 +542,11 @@ class DnsConfigServiceWin::Watcher
: public NetworkChangeNotifier::IPAddressObserver {
public:
explicit Watcher(DnsConfigServiceWin* service) : service_(service) {}
- ~Watcher() {
- NetworkChangeNotifier::RemoveIPAddressObserver(this);
- }
+ ~Watcher() { NetworkChangeNotifier::RemoveIPAddressObserver(this); }
bool Watch() {
- RegistryWatcher::CallbackType callback =
- base::Bind(&DnsConfigServiceWin::OnConfigChanged,
- base::Unretained(service_));
+ RegistryWatcher::CallbackType callback = base::Bind(
+ &DnsConfigServiceWin::OnConfigChanged, base::Unretained(service_));
bool success = true;
@@ -579,9 +571,10 @@ class DnsConfigServiceWin::Watcher
dnscache_watcher_.Watch(kDnscachePath, callback);
policy_watcher_.Watch(kPolicyPath, callback);
- if (!hosts_watcher_.Watch(GetHostsPath(), false,
- base::Bind(&Watcher::OnHostsChanged,
- base::Unretained(this)))) {
+ if (!hosts_watcher_.Watch(
+ GetHostsPath(),
+ false,
+ base::Bind(&Watcher::OnHostsChanged, base::Unretained(this)))) {
UMA_HISTOGRAM_ENUMERATION("AsyncDNS.WatchStatus",
DNS_CONFIG_WATCH_FAILED_TO_START_HOSTS,
DNS_CONFIG_WATCH_MAX);
@@ -622,8 +615,7 @@ class DnsConfigServiceWin::Watcher
class DnsConfigServiceWin::ConfigReader : public SerialWorker {
public:
explicit ConfigReader(DnsConfigServiceWin* service)
- : service_(service),
- success_(false) {}
+ : service_(service), success_(false) {}
private:
virtual ~ConfigReader() {}
@@ -637,8 +629,8 @@ class DnsConfigServiceWin::ConfigReader : public SerialWorker {
result = ConvertSettingsToDnsConfig(settings, &dns_config_);
success_ = (result == CONFIG_PARSE_WIN_OK ||
result == CONFIG_PARSE_WIN_UNHANDLED_OPTIONS);
- UMA_HISTOGRAM_ENUMERATION("AsyncDNS.ConfigParseWin",
- result, CONFIG_PARSE_WIN_MAX);
+ UMA_HISTOGRAM_ENUMERATION(
+ "AsyncDNS.ConfigParseWin", result, CONFIG_PARSE_WIN_MAX);
UMA_HISTOGRAM_BOOLEAN("AsyncDNS.ConfigParseResult", success_);
UMA_HISTOGRAM_TIMES("AsyncDNS.ConfigParseDuration",
base::TimeTicks::Now() - start_time);
@@ -670,10 +662,7 @@ class DnsConfigServiceWin::ConfigReader : public SerialWorker {
class DnsConfigServiceWin::HostsReader : public SerialWorker {
public:
explicit HostsReader(DnsConfigServiceWin* service)
- : path_(GetHostsPath()),
- service_(service),
- success_(false) {
- }
+ : path_(GetHostsPath()), service_(service), success_(false) {}
private:
virtual ~HostsReader() {}
@@ -684,8 +673,8 @@ class DnsConfigServiceWin::HostsReader : public SerialWorker {
if (ParseHostsFile(path_, &hosts_))
result = AddLocalhostEntries(&hosts_);
success_ = (result == HOSTS_PARSE_WIN_OK);
- UMA_HISTOGRAM_ENUMERATION("AsyncDNS.HostsParseWin",
- result, HOSTS_PARSE_WIN_MAX);
+ UMA_HISTOGRAM_ENUMERATION(
+ "AsyncDNS.HostsParseWin", result, HOSTS_PARSE_WIN_MAX);
UMA_HISTOGRAM_BOOLEAN("AsyncDNS.HostParseResult", success_);
UMA_HISTOGRAM_TIMES("AsyncDNS.HostsParseDuration",
base::TimeTicks::Now() - start_time);
@@ -711,7 +700,8 @@ class DnsConfigServiceWin::HostsReader : public SerialWorker {
DnsConfigServiceWin::DnsConfigServiceWin()
: config_reader_(new ConfigReader(this)),
- hosts_reader_(new HostsReader(this)) {}
+ hosts_reader_(new HostsReader(this)) {
+}
DnsConfigServiceWin::~DnsConfigServiceWin() {
config_reader_->Cancel();
@@ -726,8 +716,8 @@ void DnsConfigServiceWin::ReadNow() {
bool DnsConfigServiceWin::StartWatching() {
// TODO(szym): re-start watcher if that makes sense. http://crbug.com/116139
watcher_.reset(new Watcher(this));
- UMA_HISTOGRAM_ENUMERATION("AsyncDNS.WatchStatus", DNS_CONFIG_WATCH_STARTED,
- DNS_CONFIG_WATCH_MAX);
+ UMA_HISTOGRAM_ENUMERATION(
+ "AsyncDNS.WatchStatus", DNS_CONFIG_WATCH_STARTED, DNS_CONFIG_WATCH_MAX);
return watcher_->Watch();
}
« net/base/mime_util_unittest.cc ('K') | « net/dns/dns_config_service_win.h ('k') | net/dns/dns_config_service_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698