Clean up dns prefetch code, and also port it.

chrome/browser/net/dns_host_info_unittest.cc

 // Copyright (c) 2006-2008 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.
 
 // Single threaded tests of DnsHostInfo functionality.
 
 #include <time.h>
 #include <string>
 
 #include "base/platform_thread.h"
@@ skipping 23 matching lines @@
   PlatformThread::Sleep(500);  // Allow time for DLLs to fully load.
 
   // Complete the construction of real test object.
   info.SetHostname(hostname1);
 
   EXPECT_TRUE(info.NeedsDnsUpdate(hostname1)) << "error in construction state";
   info.SetQueuedState(DnsHostInfo::UNIT_TEST_MOTIVATED);
   EXPECT_FALSE(info.NeedsDnsUpdate(hostname1))
     << "update needed after being queued";
   info.SetAssignedState();
-  EXPECT_FALSE(info.NeedsDnsUpdate(hostname1))
-    << "update needed while assigned to slave";
+  EXPECT_FALSE(info.NeedsDnsUpdate(hostname1));
   info.SetFoundState();
   EXPECT_FALSE(info.NeedsDnsUpdate(hostname1))
     << "default expiration time is TOOOOO short";
 
   // Note that time from ASSIGNED to FOUND was VERY short (probably 0ms), so the
   // object should conclude that no network activity was needed.  As a result,
   // the required time till expiration will be halved (guessing that we were
   // half way through having the cache expire when we did the lookup.
   EXPECT_LT(info.resolve_duration().InMilliseconds(),
     DnsHostInfo::kMaxNonNetworkDnsLookupDuration.InMilliseconds())
     << "Non-net time is set too low";
 
   info.set_cache_expiration(TimeDelta::FromMilliseconds(300));
   EXPECT_FALSE(info.NeedsDnsUpdate(hostname1)) << "expiration time not honored";
   PlatformThread::Sleep(80);  // Not enough time to pass our 300ms mark.
   EXPECT_FALSE(info.NeedsDnsUpdate(hostname1)) << "expiration time not honored";
 
   // That was a nice life when the object was found.... but next time it won't
   // be found.  We'll sleep for a while, and then come back with not-found.
   info.SetQueuedState(DnsHostInfo::UNIT_TEST_MOTIVATED);
   info.SetAssignedState();
-  EXPECT_FALSE(info.NeedsDnsUpdate(hostname1))
-    << "update needed while assigned to slave";
+  EXPECT_FALSE(info.NeedsDnsUpdate(hostname1));
   // Greater than minimal expected network latency on DNS lookup.
   PlatformThread::Sleep(25);
   info.SetNoSuchNameState();
   EXPECT_FALSE(info.NeedsDnsUpdate(hostname1))
     << "default expiration time is TOOOOO short";
 
   // Note that now we'll actually utilize an expiration of 300ms,
   // since there was detected network activity time during lookup.
   // We're assuming the caching just started with our lookup.
   PlatformThread::Sleep(80);  // Not enough time to pass our 300ms mark.
   EXPECT_FALSE(info.NeedsDnsUpdate(hostname1)) << "expiration time not honored";
   // Still not past our 300ms mark (only about 4+2ms)
   PlatformThread::Sleep(80);
   EXPECT_FALSE(info.NeedsDnsUpdate(hostname1)) << "expiration time not honored";
   PlatformThread::Sleep(150);
   EXPECT_TRUE(info.NeedsDnsUpdate(hostname1)) << "expiration time not honored";
 }
 
 // TODO(jar): Add death test for illegal state changes, and also for setting
 // hostname when already set.
 
 }  // namespace