DNS: Per-network-type and Finch-variable timeouts

net/dns/dns_util.cc

Index: net/dns/dns_util.cc
diff --git a/net/dns/dns_util.cc b/net/dns/dns_util.cc
index d2897ff2ae0438dac06ec2e7b810ab1266c4cc83..5f10ad2365ff07be8ea85172bcb96497bb4fc46f 100644
--- a/net/dns/dns_util.cc
+++ b/net/dns/dns_util.cc
@@ -9,6 +9,9 @@
 
 #include <cstring>
 
+#include "base/metrics/field_trial.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_split.h"
 #include "build/build_config.h"
 
 #if defined(OS_POSIX)
@@ -152,4 +155,41 @@ bool HaveOnlyLoopbackAddresses() {
 #endif  // defined(various platforms)
 }
 
+#if !defined(OS_NACL)
+namespace {
+
+bool GetTimeDeltaForConnectionTypeFromFieldTrial(
+    const char* field_trial,
+    NetworkChangeNotifier::ConnectionType type,
+    base::TimeDelta* out) {
+  std::string group = base::FieldTrialList::FindFullName(field_trial);
+  if (group.empty())
+    return false;
+  std::vector<base::StringPiece> group_parts = base::SplitStringPiece(
+      group, ":", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  if (type < 0)
+    return false;
+  size_t type_size = static_cast<size_t>(type);
+  if (type_size >= group_parts.size())
+    return false;
+  int64_t ms;
+  if (!base::StringToInt64(group_parts[type_size], &ms))
+    return false;
+  *out = base::TimeDelta::FromMilliseconds(ms);
+  return true;
+}
+
+}  // namespace
+
+base::TimeDelta GetTimeDeltaForConnectionTypeFromFieldTrialOrDefault(
+    const char* field_trial,
+    base::TimeDelta default_delta,
+    NetworkChangeNotifier::ConnectionType type) {
+  base::TimeDelta out;
+  if (!GetTimeDeltaForConnectionTypeFromFieldTrial(field_trial, type, &out))
+    out = default_delta;
+  return out;
+}
+#endif  // !defined(OS_NACL)
+
 }  // namespace net