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

net/dns/dns_config_service_win.h

Index: net/dns/dns_config_service_win.h
diff --git a/net/dns/dns_config_service_win.h b/net/dns/dns_config_service_win.h
index 06fc0d9663b42eca93c71252b76e534f770dd971..9503dc8593ffafeec42bc28c8f1bc8c25672625c 100644
--- a/net/dns/dns_config_service_win.h
+++ b/net/dns/dns_config_service_win.h
@@ -34,19 +34,6 @@ 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
@@ -98,6 +85,10 @@ struct NET_EXPORT_PRIVATE DnsSystemSettings {
 
   // 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 {
@@ -113,6 +104,7 @@ enum ConfigParseWinResult {
   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.
 };