Use Histogram algorithm to calculate DNS timeout. Honor DnsConfig timeout if it exceeds 5s.

net/dns/dns_session_unittest.cc

Index: net/dns/dns_session_unittest.cc
diff --git a/net/dns/dns_session_unittest.cc b/net/dns/dns_session_unittest.cc
index d0a12f2636fdd2e0f92dae9fcfd4695089627ddb..ad587c11ccb509bdce9599201637e9033995b597 100644
--- a/net/dns/dns_session_unittest.cc
+++ b/net/dns/dns_session_unittest.cc
@@ -220,6 +220,29 @@ TEST_F(DnsSessionTest, AllocateFree) {
   EXPECT_TRUE(NoMoreEvents());
 }
 
-} // namespace
+TEST_F(DnsSessionTest, HistogramTimeoutNormal) {
+  Initialize(2);
+  // Calculated timeout must be within 10ms of config timeout.

[szym, 2013/07/25 22:47:24]

Put comments on expectations just before TEST_F.

[mef, 2013/07/26 11:27:07]

Done.

+  base::TimeDelta timeoutDelta = session_->NextTimeout(0, 0) - config_.timeout;
+  EXPECT_LT(timeoutDelta.InMilliseconds(), 10);
+}
+
+TEST_F(DnsSessionTest, HistogramTimeoutShort) {
+  config_.timeout = base::TimeDelta::FromMilliseconds(15);
+  Initialize(2);
+  // Calculated timeout must be within 10ms of config timeout.
+  base::TimeDelta timeoutDelta = session_->NextTimeout(0, 0) - config_.timeout;
+  EXPECT_LT(timeoutDelta.InMilliseconds(), 10);
+}
+
+TEST_F(DnsSessionTest, HistogramTimeoutLong) {
+  config_.timeout = base::TimeDelta::FromSeconds(15);
+  Initialize(2);
+  // Long timeout must be honored exactly.
+  base::TimeDelta timeout = session_->NextTimeout(0, 0);
+  EXPECT_EQ(config_.timeout.InMilliseconds(), timeout.InMilliseconds());
+}
+
+}  // namespace
 
 } // namespace net