net: disable DNS lookup tests.

These tests have yielded useful data and I'll probably tweak them for
the future. However, I want a CL which disables them so that I can merge
it into the release branch for M10.

BUG=none
TEST=net_unittests

Review URL: http://codereview.chromium.org/6287023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73189 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 38 deletions

diff --git a/net/socket/ssl_host_info.cc b/net/socket/ssl_host_info.cc
index bd7a4ad..5131949c 100644
--- a/net/socket/ssl_host_info.cc
+++ b/net/socket/ssl_host_info.cc
@@ -57,15 +57,8 @@ SSLHostInfo::~SSLHostInfo() {
 }
 
 void SSLHostInfo::StartDnsLookup(DnsRRResolver* dnsrr_resolver) {
-#if defined(OS_LINUX)
   dnsrr_resolver_ = dnsrr_resolver;
-  dns_callback_ = NewCallback(this, &SSLHostInfo::DnsComplete);
-  dns_lookup_start_time_ = base::TimeTicks::Now();
-
-  dns_handle_ = dnsrr_resolver->Resolve(
-      hostname_, kDNS_CAA, DnsRRResolver::FLAG_WANT_DNSSEC, dns_callback_,
-      &dns_response_, 0, BoundNetLog());
-#endif
+  // Note: currently disabled.
 }
 
 const SSLHostInfo::State& SSLHostInfo::state() const {
@@ -76,20 +69,6 @@ SSLHostInfo::State* SSLHostInfo::mutable_state() {
   return &state_;
 }
 
-void SSLHostInfo::set_cert_verification_finished_time() {
-#if defined(OS_LINUX)
-  if (dnsrr_resolver_ && dns_handle_ == DnsRRResolver::kInvalidHandle) {
-    // We have completed the DNS lookup already. Therefore, waiting for the DNS
-    // lookup would cause no delay.
-    UMA_HISTOGRAM_TIMES("Net.SSLHostInfoDNSLookupDelayMs", base::TimeDelta());
-  } else {
-    // The actual delay will be calculated when the DNS lookup finishes, in
-    // DnsComplete.
-    cert_verification_finished_time_ = base::TimeTicks::Now();
-  }
-#endif
-}
-
 bool SSLHostInfo::Parse(const std::string& data) {
   State* state = mutable_state();
 
@@ -232,22 +211,6 @@ void SSLHostInfo::VerifyCallback(int rv) {
   }
 }
 
-void SSLHostInfo::DnsComplete(int rv) {
-  dns_handle_ = DnsRRResolver::kInvalidHandle;
-  delete dns_callback_;
-  dns_callback_ = NULL;
-
-  const base::TimeTicks now = base::TimeTicks::Now();
-  base::TimeDelta elapsed = now - dns_lookup_start_time_;
-  UMA_HISTOGRAM_TIMES("Net.SSLHostInfoDNSLookup", elapsed);
-
-  if (!cert_verification_finished_time_.is_null()) {
-    elapsed = now - cert_verification_finished_time_;
-    UMA_HISTOGRAM_TIMES("Net.SSLHostInfoDNSLookupDelayMs", elapsed);
-  }
-}
-
-
 SSLHostInfoFactory::~SSLHostInfoFactory() {}
 
 }  // namespace net