[net/dns] Instrument DnsConfigService to measure performance and failures.

net/dns/dns_config_service_unittest.cc

 // 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.
 
 #include "net/dns/dns_config_service.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/cancelable_callback.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 171 matching lines @@
 
   service_->OnConfigRead(config2);
   service_->OnHostsRead(config2.hosts);
   EXPECT_TRUE(last_config_.Equals(config2));
 
   service_->OnConfigRead(config3);
   service_->OnHostsRead(config3.hosts);
   EXPECT_TRUE(last_config_.Equals(config3));
 }
 
-#if defined(OS_POSIX) || defined(OS_WIN)
+#if (defined(OS_POSIX) && !defined(OS_ANDROID)) || defined(OS_WIN)
 // TODO(szym): This is really an integration test and can time out if HOSTS is
 // huge. http://crbug.com/107810
 TEST_F(DnsConfigServiceTest, FLAKY_GetSystemConfig) {
   service_.reset();
   scoped_ptr<DnsConfigService> service(DnsConfigService::CreateSystemService());
 
   service->Read(base::Bind(&DnsConfigServiceTest::OnConfigChanged,
                            base::Unretained(this)));
   base::TimeDelta kTimeout = TestTimeouts::action_max_timeout();
   WaitForConfig(kTimeout);
   ASSERT_TRUE(last_config_.IsValid()) << "Did not receive DnsConfig in " <<
       kTimeout.InSecondsF() << "s";
 }
 #endif  // OS_POSIX || OS_WIN
 
 }  // namespace net