Platform cleanup in chrome/browser/net.

chrome/browser/net/dns_master_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.
 
 // Multi-threaded tests of DnsMaster and DnsPrefetch slave functionality.
 
 #include <time.h>
 #include <ws2tcpip.h>
 #include <Wspiapi.h>  // Needed for win2k compatibility
 
 #include <algorithm>
 #include <map>
 #include <sstream>
 #include <string>
 
+#include "base/platform_thread.h"
 #include "base/spin_wait.h"
 #include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/net/dns_host_info.h"
 #include "chrome/browser/net/dns_slave.h"
 #include "net/base/winsock_init.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 
 using base::Time;
 using base::TimeDelta;
@@ skipping 55 matching lines @@
 
     if (latency.end() != latency.find(hostname)) {
       duration = latency[hostname];
     } else {
       duration = 500;
     }
     // Change latency to simulate cache warming (next latency will be short).
     latency[hostname] = 1;
   }  // Release lock.
 
-  Sleep(duration);
+  PlatformThread::Sleep(duration);
 
   return was_found ? 0 : WSAHOST_NOT_FOUND;
 }
 
 static void SetupNetworkInfrastructure() {
   bool kUseFakeNetwork = true;
   if (kUseFakeNetwork)
     chrome_browser_net::SetAddrinfoCallbacks(fake_get_addr_info,
                                                  fake_free_addr_info);
 }
@@ skipping 175 matching lines @@
   SPIN_FOR_1_SECOND_OR_UNTIL_TRUE(0 <=
       testing_master.GetResolutionDuration(bad2).InMilliseconds());
 
   // Verify both fictitious names are resolved by now.
   // Typical random name takes about 20-30 ms
   EXPECT_LT(0, testing_master.GetResolutionDuration(bad1).InMilliseconds());
   EXPECT_LT(0, testing_master.GetResolutionDuration(bad2).InMilliseconds());
   EXPECT_FALSE(testing_master.WasFound(bad1));
   EXPECT_FALSE(testing_master.WasFound(bad2));
 
-  EXPECT_EQ(1, testing_master.running_slave_count());
+  EXPECT_EQ(1U, testing_master.running_slave_count());
 
   // With just one thread (doing nothing now), ensure a clean shutdown.
   EXPECT_TRUE(testing_master.ShutdownSlaves());
 }
 
 TEST(DnsMasterTest, DISABLED_MultiThreadedLookupTest) {
   SetupNetworkInfrastructure();
   net::EnsureWinsockInit();
   DnsMaster testing_master(TimeDelta::FromSeconds(30));
   DnsPrefetcherInit dns_init(NULL);
@@ skipping 27 matching lines @@
 
   Sleep(10);  // Allow time for async DNS to get answers.
 
   EXPECT_TRUE(testing_master.WasFound(goog));
   EXPECT_TRUE(testing_master.WasFound(goog3));
   EXPECT_TRUE(testing_master.WasFound(goog2));
   EXPECT_TRUE(testing_master.WasFound(goog4));
   EXPECT_FALSE(testing_master.WasFound(bad1));
   EXPECT_FALSE(testing_master.WasFound(bad2));
 
-  EXPECT_EQ(8, testing_master.running_slave_count());
+  EXPECT_EQ(8U, testing_master.running_slave_count());
 
   EXPECT_TRUE(testing_master.ShutdownSlaves());
 }
 
 TEST(DnsMasterTest, DISABLED_MultiThreadedSpeedupTest) {
   SetupNetworkInfrastructure();
   net::EnsureWinsockInit();
   DnsMaster testing_master(TimeDelta::FromSeconds(30));
   DnsPrefetcherInit dns_init(NULL);
 
@@ skipping 25 matching lines @@
 
   EXPECT_TRUE(testing_master.WasFound(goog));
   EXPECT_FALSE(testing_master.WasFound(bad1));
   EXPECT_FALSE(testing_master.WasFound(bad2));
   // ...and due to delay in geting resolution of bad names, the single slave
   // thread won't have time to finish the list.
   EXPECT_FALSE(testing_master.WasFound(goog3));
   EXPECT_FALSE(testing_master.WasFound(goog2));
   EXPECT_FALSE(testing_master.WasFound(goog4));
 
-  EXPECT_EQ(1, testing_master.running_slave_count());
+  EXPECT_EQ(1U, testing_master.running_slave_count());
 
   // Get all 8 threads running by calling many times before queue is handled.
   names.clear();
   for (int i = 0; i < 10; i++)
     testing_master.Resolve(GetNonexistantDomain(),
                            DnsHostInfo::PAGE_SCAN_MOTIVATED);
 
   // Wait long enough for all the goog's to be resolved.
   // They should all take about the same time, and run in parallel.
   SPIN_FOR_1_SECOND_OR_UNTIL_TRUE(0 <=
@@ skipping 23 matching lines @@
       testing_master.GetResolutionDuration(bad2).InMilliseconds());
 
 
   // Well known names should resolve faster than bad names.
   EXPECT_GE(testing_master.GetResolutionDuration(bad1).InMilliseconds(),
               testing_master.GetResolutionDuration(goog).InMilliseconds());
 
   EXPECT_GE(testing_master.GetResolutionDuration(bad2).InMilliseconds(),
               testing_master.GetResolutionDuration(goog4).InMilliseconds());
 
-  EXPECT_EQ(8, testing_master.running_slave_count());
+  EXPECT_EQ(8U, testing_master.running_slave_count());
 
   EXPECT_TRUE(testing_master.ShutdownSlaves());
 }
 
 }  // namespace