[net/dns] Treat Name Resolution Policy Table as unhandled option.

net/dns/dns_config_service_win.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_DNS_DNS_CONFIG_SERVICE_WIN_H_
 #define NET_DNS_DNS_CONFIG_SERVICE_WIN_H_
 
 // The sole purpose of dns_config_service_win.h is for unittests so we just
 // include these headers here.
 #include <winsock2.h>
@@ skipping 16 matching lines @@
 // but on earlier versions it is insufficient.
 //
 // Experimental evaluation of Windows behavior suggests that domain parsing is
 // naive. Domain suffixes in |search| are not validated until they are appended
 // to the resolved name. We attempt to replicate this behavior.
 
 namespace net {
 
 namespace internal {
 
-// Registry key paths.
-const wchar_t* const kTcpipPath =
-    L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters";
-const wchar_t* const kTcpip6Path =
-    L"SYSTEM\\CurrentControlSet\\Services\\Tcpip6\\Parameters";
-const wchar_t* const kDnscachePath =
-    L"SYSTEM\\CurrentControlSet\\Services\\Dnscache\\Parameters";
-const wchar_t* const kPolicyPath =
-    L"SOFTWARE\\Policies\\Microsoft\\Windows NT\\DNSClient";
-
-// Returns the path to the HOSTS file.
-base::FilePath GetHostsPath();
-
 // Parses |value| as search list (comma-delimited list of domain names) from
 // a registry key and stores it in |out|. Returns true on success. Empty
 // entries (e.g., "chromium.org,,org") terminate the list. Non-ascii hostnames
 // are converted to punycode.
 bool NET_EXPORT_PRIVATE ParseSearchList(const base::string16& value,
                                         std::vector<std::string>* out);
 
 // All relevant settings read from registry and IP Helper. This isolates our
 // logic from system calls and is exposed for unit tests. Keep it an aggregate
 // struct for easy initialization.
@@ skipping 31 matching lines @@
 
   // SOFTWARE\Policies\Microsoft\Windows NT\DNSClient
   DevolutionSetting policy_devolution;
   // SYSTEM\CurrentControlSet\Dnscache\Parameters
   DevolutionSetting dnscache_devolution;
   // SYSTEM\CurrentControlSet\Tcpip\Parameters
   DevolutionSetting tcpip_devolution;
 
   // SOFTWARE\Policies\Microsoft\Windows NT\DNSClient\AppendToMultiLabelName
   RegDword append_to_multi_label_name;
+
+  // True when the Name Resolution Policy Table (NRPT) has at least one rule:
+  // SOFTWARE\Policies\Microsoft\Windows NT\DNSClient\DnsPolicyConfig\Rule*
+  bool have_name_resolution_policy;
 };
 
 enum ConfigParseWinResult {
   CONFIG_PARSE_WIN_OK = 0,
   CONFIG_PARSE_WIN_READ_IPHELPER,
   CONFIG_PARSE_WIN_READ_POLICY_SEARCHLIST,
   CONFIG_PARSE_WIN_READ_TCPIP_SEARCHLIST,
   CONFIG_PARSE_WIN_READ_DOMAIN,
   CONFIG_PARSE_WIN_READ_POLICY_DEVOLUTION,
   CONFIG_PARSE_WIN_READ_DNSCACHE_DEVOLUTION,
   CONFIG_PARSE_WIN_READ_TCPIP_DEVOLUTION,
   CONFIG_PARSE_WIN_READ_APPEND_MULTILABEL,
   CONFIG_PARSE_WIN_READ_PRIMARY_SUFFIX,
   CONFIG_PARSE_WIN_BAD_ADDRESS,
   CONFIG_PARSE_WIN_NO_NAMESERVERS,
+  CONFIG_PARSE_WIN_UNHANDLED_OPTIONS,

[cbentzel, 2013/09/16 10:11:50]

Did you add this new value simply to see UMA for how frequently this case
happens?

[mmenke, 2013/09/16 16:34:46]

You should add this to histograms.xml in this CL, too.  Now that the histograms
are public, no need for a separate CL.

[szym, 2013/09/16 19:17:35]

The CL initially had it, but I removed it so that it's easier to revert this
without touching histograms.xml. That said, I think once this lands, the enum
ConfigParseWinResult will need to stay anyway.

[szym, 2013/09/16 19:17:35]

Yes. This follows dns_config_service_posix.*

   CONFIG_PARSE_WIN_MAX  // Bounding values for enumeration.
 };
 
 // Fills in |dns_config| from |settings|. Exposed for tests.
 ConfigParseWinResult NET_EXPORT_PRIVATE ConvertSettingsToDnsConfig(
     const DnsSystemSettings& settings,
     DnsConfig* dns_config);
 
 // Use DnsConfigService::CreateSystemService to use it outside of tests.
 class NET_EXPORT_PRIVATE DnsConfigServiceWin : public DnsConfigService {
@@ skipping 19 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(DnsConfigServiceWin);
 };
 
 }  // namespace internal
 
 }  // namespace net
 
 #endif  // NET_DNS_DNS_CONFIG_SERVICE_WIN_H_